From 093ec762abc4d46fbd4d68fd9872db16dc10e357 Mon Sep 17 00:00:00 2001
From: Etienne Lescot <etiennelescot@gmail.com>
Date: Sun, 15 Mar 2026 10:46:37 +0100
Subject: [PATCH 01/38] feat: add cursor overlay pipeline

---
 src/assets/cursors/Cursor=Beachball.svg       |  46 ++
 src/assets/cursors/Cursor=Cross.svg           |   5 +
 src/assets/cursors/Cursor=Default.svg         |   5 +
 src/assets/cursors/Cursor=Hand-(Grabbing).svg |   5 +
 src/assets/cursors/Cursor=Hand-(Open).svg     |   5 +
 src/assets/cursors/Cursor=Hand-(Pointing).svg |   5 +
 src/assets/cursors/Cursor=Menu.svg            |  18 +
 src/assets/cursors/Cursor=Move.svg            |   5 +
 src/assets/cursors/Cursor=Resize-(Down).svg   |   5 +
 src/assets/cursors/Cursor=Resize-(Left).svg   |   5 +
 .../cursors/Cursor=Resize-(Left-Right).svg    |   5 +
 src/assets/cursors/Cursor=Resize-(Right).svg  |   5 +
 src/assets/cursors/Cursor=Resize-(Up).svg     |   5 +
 .../cursors/Cursor=Resize-(Up-Down).svg       |   5 +
 .../Cursor=Resize-North-East-South-West.svg   |   5 +
 .../cursors/Cursor=Resize-North-South.svg     |   5 +
 .../Cursor=Resize-North-West-South-East.svg   |   5 +
 .../cursors/Cursor=Resize-West-East.svg       |   5 +
 src/assets/cursors/Cursor=Text-Cursor.svg     |   5 +
 src/assets/cursors/Cursor=Zoom-In.svg         |   8 +
 src/assets/cursors/Cursor=Zoom-Out.svg        |   6 +
 src/components/video-editor/SettingsPanel.tsx | 140 +++-
 src/components/video-editor/VideoEditor.tsx   |  44 +-
 src/components/video-editor/VideoPlayback.tsx | 114 ++-
 .../video-editor/projectPersistence.ts        |  47 +-
 src/components/video-editor/types.ts          |  24 +
 .../videoPlayback/cursorRenderer.ts           | 766 ++++++++++++++++++
 .../videoPlayback/motionSmoothing.ts          | 149 ++++
 .../videoPlayback/uploadedCursorAssets.ts     |  70 ++
 29 files changed, 1440 insertions(+), 77 deletions(-)
 create mode 100644 src/assets/cursors/Cursor=Beachball.svg
 create mode 100644 src/assets/cursors/Cursor=Cross.svg
 create mode 100644 src/assets/cursors/Cursor=Default.svg
 create mode 100644 src/assets/cursors/Cursor=Hand-(Grabbing).svg
 create mode 100644 src/assets/cursors/Cursor=Hand-(Open).svg
 create mode 100644 src/assets/cursors/Cursor=Hand-(Pointing).svg
 create mode 100644 src/assets/cursors/Cursor=Menu.svg
 create mode 100644 src/assets/cursors/Cursor=Move.svg
 create mode 100644 src/assets/cursors/Cursor=Resize-(Down).svg
 create mode 100644 src/assets/cursors/Cursor=Resize-(Left).svg
 create mode 100644 src/assets/cursors/Cursor=Resize-(Left-Right).svg
 create mode 100644 src/assets/cursors/Cursor=Resize-(Right).svg
 create mode 100644 src/assets/cursors/Cursor=Resize-(Up).svg
 create mode 100644 src/assets/cursors/Cursor=Resize-(Up-Down).svg
 create mode 100644 src/assets/cursors/Cursor=Resize-North-East-South-West.svg
 create mode 100644 src/assets/cursors/Cursor=Resize-North-South.svg
 create mode 100644 src/assets/cursors/Cursor=Resize-North-West-South-East.svg
 create mode 100644 src/assets/cursors/Cursor=Resize-West-East.svg
 create mode 100644 src/assets/cursors/Cursor=Text-Cursor.svg
 create mode 100644 src/assets/cursors/Cursor=Zoom-In.svg
 create mode 100644 src/assets/cursors/Cursor=Zoom-Out.svg
 create mode 100644 src/components/video-editor/videoPlayback/cursorRenderer.ts
 create mode 100644 src/components/video-editor/videoPlayback/motionSmoothing.ts
 create mode 100644 src/components/video-editor/videoPlayback/uploadedCursorAssets.ts

diff --git a/src/assets/cursors/Cursor=Beachball.svg b/src/assets/cursors/Cursor=Beachball.svg
new file mode 100644
index 000000000..30bdbe502
--- /dev/null
+++ b/src/assets/cursors/Cursor=Beachball.svg
@@ -0,0 +1,46 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_1_311)">
+<path d="M12.0455 7.54446C12.819 7.64044 13.5864 7.88965 14.3038 8.30386C17.1736 9.96071 18.1568 13.6303 16.5 16.5C14.8431 13.6303 11.1736 12.647 8.30384 14.3039C7.58745 14.7175 6.98862 15.2565 6.51907 15.8772C6.74376 12.2206 8.93355 9.09535 12.0455 7.54446Z" fill="url(#paint0_linear_1_311)"/>
+<path d="M6.51908 15.8772C6.98862 15.2565 7.58745 14.7175 8.30385 14.3038C11.1736 12.647 14.8431 13.6302 16.5 16.5C13.1863 16.5 10.5 19.1863 10.5 22.5C10.5 23.3277 10.6676 24.1162 10.9707 24.8336C8.27601 23.0421 6.5 19.9784 6.5 16.5C6.5 16.2908 6.50642 16.0832 6.51908 15.8772Z" fill="url(#paint1_linear_1_311)"/>
+<path d="M10.9707 24.8336C10.6676 24.1163 10.5 23.3277 10.5 22.5C10.5 19.1863 13.1863 16.5 16.5 16.5C14.8431 19.3698 15.8264 23.0393 18.6962 24.6962C19.4136 25.1104 20.181 25.3596 20.9545 25.4555C19.6131 26.124 18.1005 26.5 16.5 26.5C14.4556 26.5 12.5545 25.8865 10.9707 24.8336Z" fill="url(#paint2_linear_1_311)"/>
+<path d="M20.9545 25.4555C20.181 25.3596 19.4136 25.1104 18.6962 24.6962C15.8264 23.0393 14.8432 19.3698 16.5 16.5C18.1569 19.3698 21.8264 20.353 24.6962 18.6962C25.4126 18.2825 26.0114 17.7435 26.4809 17.1228C26.2562 20.7794 24.0665 23.9047 20.9545 25.4555Z" fill="url(#paint3_linear_1_311)"/>
+<path d="M26.4809 17.1228C26.0114 17.7435 25.4125 18.2825 24.6962 18.6961C21.8264 20.353 18.1569 19.3697 16.5 16.5C19.8137 16.5 22.5 13.8137 22.5 10.5C22.5 9.67229 22.3324 8.88374 22.0293 8.16641C24.724 9.95791 26.5 13.0215 26.5 16.5C26.5 16.7092 26.4936 16.9168 26.4809 17.1228Z" fill="url(#paint4_linear_1_311)"/>
+<path d="M22.0293 8.16642C22.3324 8.88375 22.5 9.6723 22.5 10.5C22.5 13.8137 19.8137 16.5 16.5 16.5C18.1569 13.6302 17.1736 9.9607 14.3038 8.30385C13.5864 7.88964 12.819 7.64043 12.0455 7.54445C13.3869 6.87599 14.8995 6.5 16.5 6.5C18.5444 6.5 20.4455 7.11349 22.0293 8.16642Z" fill="url(#paint5_linear_1_311)"/>
+</g>
+<defs>
+<filter id="filter0_d_1_311" x="4.5" y="5.5" width="24" height="24" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.4049 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1_311"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1_311" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_1_311" x1="545.808" y1="7.54446" x2="545.808" y2="903.099" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFD305" style="stop-color:#FFD305;stop-color:color(display-p3 1.0000 0.8275 0.0196);stop-opacity:1;"/>
+<stop offset="1" stop-color="#FDCF01" style="stop-color:#FDCF01;stop-color:color(display-p3 0.9922 0.8118 0.0039);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1_311" x1="506.5" y1="13.499" x2="506.5" y2="1146.96" gradientUnits="userSpaceOnUse">
+<stop stop-color="#52CF30" style="stop-color:#52CF30;stop-color:color(display-p3 0.3216 0.8118 0.1882);stop-opacity:1;"/>
+<stop offset="1" stop-color="#3BBD1C" style="stop-color:#3BBD1C;stop-color:color(display-p3 0.2314 0.7412 0.1098);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1_311" x1="533.223" y1="16.5" x2="533.223" y2="1016.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#14ADF6" style="stop-color:#14ADF6;stop-color:color(display-p3 0.0784 0.6784 0.9647);stop-opacity:1;"/>
+<stop offset="1" stop-color="#1191F4" style="stop-color:#1191F4;stop-color:color(display-p3 0.0667 0.5686 0.9569);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1_311" x1="554.984" y1="16.5" x2="554.984" y2="912.055" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CA70E1" style="stop-color:#CA70E1;stop-color:color(display-p3 0.7922 0.4392 0.8824);stop-opacity:1;"/>
+<stop offset="1" stop-color="#B452CB" style="stop-color:#B452CB;stop-color:color(display-p3 0.7059 0.3216 0.7961);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="paint4_linear_1_311" x1="516.5" y1="8.16641" x2="516.5" y2="1141.62" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FF645D" style="stop-color:#FF645D;stop-color:color(display-p3 1.0000 0.3922 0.3647);stop-opacity:1;"/>
+<stop offset="1" stop-color="#FF4332" style="stop-color:#FF4332;stop-color:color(display-p3 1.0000 0.2627 0.1961);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="paint5_linear_1_311" x1="534.769" y1="6.5" x2="534.769" y2="1006.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FBB114" style="stop-color:#FBB114;stop-color:color(display-p3 0.9843 0.6941 0.0784);stop-opacity:1;"/>
+<stop offset="1" stop-color="#FF9508" style="stop-color:#FF9508;stop-color:color(display-p3 1.0000 0.5843 0.0314);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Cross.svg b/src/assets/cursors/Cursor=Cross.svg
new file mode 100644
index 000000000..b404553da
--- /dev/null
+++ b/src/assets/cursors/Cursor=Cross.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 9C17.328 9 18 9.672 18 10.5V15H22.5C23.2793 15 23.9204 15.5953 23.9931 16.3556L24 16.5C24 17.328 23.328 18 22.5 18H18V22.5C18 23.2793 17.4047 23.9204 16.6444 23.9931L16.5 24C15.672 24 15 23.328 15 22.5V18H10.5C9.72071 18 9.0796 17.4047 9.00687 16.6444L9 16.5C9 15.672 9.672 15 10.5 15H15V10.5C15 9.72071 15.5953 9.0796 16.3556 9.00687L16.5 9Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 10C16.776 10 17 10.224 17 10.5V16H22.5C22.7453 16 22.9496 16.177 22.9919 16.4102L23 16.5C23 16.776 22.776 17 22.5 17H17V22.5C17 22.7453 16.823 22.9496 16.5898 22.9919L16.5 23C16.224 23 16 22.776 16 22.5V17H10.5C10.2547 17 10.0504 16.823 10.0081 16.5898L10 16.5C10 16.224 10.224 16 10.5 16H16V10.5C16 10.2547 16.177 10.0504 16.4102 10.0081L16.5 10Z" fill="#232020" style="fill:#232020;fill:color(display-p3 0.1373 0.1255 0.1255);fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Default.svg b/src/assets/cursors/Cursor=Default.svg
new file mode 100644
index 000000000..f76f31fd7
--- /dev/null
+++ b/src/assets/cursors/Cursor=Default.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.501 13.8601L24.884 22.2611C25.937 23.3171 25.19 25.1191 23.699 25.1191L22.475 25.119L23.6908 28.0067C23.9038 28.5127 23.9068 29.0727 23.6998 29.5817C23.4918 30.0917 23.0978 30.4897 22.5898 30.7027C22.3338 30.8097 22.0658 30.8637 21.7918 30.8637C20.9608 30.8637 20.2158 30.3687 19.8938 29.6027L18.616 26.565L17.784 27.3031C16.703 28.2591 15 27.4921 15 26.0481V14.4811C15 13.6971 15.947 13.3051 16.501 13.8601Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9995 15.1292C15.9995 14.9982 16.1585 14.9322 16.2505 15.0252L24.1585 22.9502C24.5895 23.3822 24.2835 24.1192 23.6735 24.1192L20.9695 24.1177L22.7691 28.3936C22.9961 28.9336 22.7421 29.5546 22.2031 29.7806C21.6621 30.0076 21.0421 29.7546 20.8161 29.2156L18.9985 24.8917L17.1385 26.5392C16.7225 26.9072 16.0806 26.6507 16.0065 26.1274L15.9995 26.0262V15.1292Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Hand-(Grabbing).svg b/src/assets/cursors/Cursor=Hand-(Grabbing).svg
new file mode 100644
index 000000000..082786750
--- /dev/null
+++ b/src/assets/cursors/Cursor=Hand-(Grabbing).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.7191 13.556C23.3671 13.299 22.9751 13.199 22.5421 13.258C22.3341 13.286 22.1621 13.347 22.0191 13.432C22.0241 13.273 22.0121 13.122 21.9761 12.98C21.9011 12.683 21.7611 12.439 21.5561 12.247C21.3511 12.055 21.1051 11.917 20.8181 11.832C20.5581 11.754 20.2931 11.731 20.0231 11.764C19.7521 11.797 19.5101 11.889 19.2951 12.042C19.2251 12.092 19.1731 12.156 19.1171 12.217C19.0781 12.148 19.0421 12.077 18.9871 12.013C18.8211 11.821 18.6101 11.673 18.3531 11.569C18.0961 11.465 17.8231 11.412 17.5371 11.412C17.2441 11.412 16.9681 11.465 16.7121 11.569C16.4551 11.673 16.2431 11.821 16.0771 12.013C16.0231 12.075 15.9891 12.145 15.9491 12.213C15.9121 12.171 15.8811 12.123 15.8381 12.086C15.6621 11.936 15.4551 11.834 15.2171 11.778C14.9801 11.723 14.7411 11.715 14.5001 11.754C14.1941 11.799 13.9191 11.914 13.6741 12.096C13.4301 12.278 13.2501 12.524 13.1321 12.833C13.0231 13.122 13.0101 13.464 13.0771 13.847C12.5071 13.777 11.9771 13.943 11.4921 14.356C10.9911 14.783 10.7431 15.455 10.7501 16.373C10.7561 17.857 11.0381 19.175 11.5941 20.328C12.1511 21.48 12.9341 22.381 13.9431 23.028C14.9521 23.676 16.1211 24 17.4491 24C18.6601 24 19.6951 23.787 20.5551 23.36C21.4141 22.934 22.1101 22.317 22.6401 21.509C23.1701 20.703 23.5561 19.703 23.7971 18.511C23.9271 17.881 24.0291 17.261 24.1051 16.656C24.1801 16.05 24.2241 15.41 24.2361 14.732C24.2431 14.205 24.0701 13.813 23.7191 13.556Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2635 14.9171L13.5095 16.1871C13.5555 16.4281 13.6755 16.5821 13.8705 16.6461C14.0665 16.7121 14.2435 16.6801 14.4035 16.5531C14.5625 16.4261 14.6165 16.2461 14.5645 16.0111L14.0565 13.5801C13.9975 13.3261 14.0715 13.1211 14.2765 12.9651C14.4815 12.8091 14.7085 12.7501 14.9595 12.7891C15.2105 12.8281 15.3715 12.9751 15.4435 13.2291L15.5895 13.7561C15.6415 13.9581 15.7635 14.0851 15.9555 14.1371C16.1485 14.1891 16.3315 14.1661 16.5075 14.0691C16.6835 13.9711 16.7715 13.8281 16.7715 13.6391V12.9651C16.7715 12.7891 16.8445 12.6481 16.9915 12.5401C17.1375 12.4331 17.3155 12.3791 17.5235 12.3791C17.7255 12.3791 17.8995 12.4331 18.0465 12.5401C18.1925 12.6481 18.2655 12.7891 18.2655 12.9651V13.6391C18.2655 13.8211 18.3535 13.9631 18.5295 14.0641C18.7055 14.1651 18.8885 14.1891 19.0815 14.1371C19.2735 14.0851 19.3955 13.9581 19.4475 13.7561L19.6035 13.2091C19.6695 12.9681 19.8255 12.8281 20.0725 12.7891C20.3195 12.7501 20.5465 12.8091 20.7515 12.9651C20.9565 13.1211 21.0325 13.3261 20.9805 13.5801L20.8245 14.4591C20.7785 14.6931 20.8245 14.8761 20.9615 15.0061C21.0975 15.1361 21.2635 15.1981 21.4595 15.1911C21.6545 15.1851 21.8015 15.1131 21.8985 14.9761L22.1525 14.5661C22.2435 14.4291 22.3795 14.3501 22.5575 14.3271C22.7365 14.3041 22.8975 14.3411 23.0415 14.4391C23.1845 14.5371 23.2565 14.6771 23.2565 14.8591C23.2565 15.4001 23.2175 15.9181 23.1385 16.4121C23.0605 16.9071 22.9465 17.4761 22.7975 18.1211L22.7385 18.3941C22.5115 19.4101 22.1845 20.2471 21.7625 20.9041C21.3395 21.5621 20.7775 22.0581 20.0775 22.3931C19.3775 22.7291 18.5125 22.8961 17.4845 22.8961C16.3445 22.8961 15.3455 22.6171 14.4865 22.0561C13.6265 21.4971 12.9655 20.7171 12.5035 19.7171C12.0415 18.7181 11.8105 17.5811 11.8105 16.3041C11.8105 15.8491 11.9095 15.4991 12.1085 15.2551C12.3065 15.0101 12.5445 14.8781 12.8215 14.8541C12.9845 14.8411 13.1285 14.8681 13.2635 14.9171Z" fill="white" style="fill:white;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Hand-(Open).svg b/src/assets/cursors/Cursor=Hand-(Open).svg
new file mode 100644
index 000000000..4ceafb0f0
--- /dev/null
+++ b/src/assets/cursors/Cursor=Hand-(Open).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5908 23.4186C16.6578 23.4186 15.8038 23.2506 15.0528 22.9196C14.2958 22.5856 13.6148 22.0696 13.0298 21.3876C12.4598 20.7226 11.9558 19.8716 11.5308 18.8596L9.61877 14.1546C9.47777 13.8136 9.46177 13.4866 9.57177 13.1866C9.69177 12.8636 9.92977 12.6346 10.2618 12.5236C10.3818 12.4806 10.5158 12.4556 10.6488 12.4556C10.8128 12.4556 10.9718 12.4926 11.1228 12.5656C11.3728 12.6876 11.5798 12.9046 11.7388 13.2116L13.3258 16.0706C13.4298 16.2506 13.5078 16.3166 13.5358 16.3366C13.5788 16.3656 13.6208 16.3776 13.6768 16.3776C13.7438 16.3776 13.7848 16.3586 13.8308 16.3066C13.8498 16.2846 13.8778 16.1896 13.8428 15.9836L12.7408 8.9466C12.6648 8.5056 12.7988 8.1986 12.9258 8.0206C13.1068 7.7656 13.3658 7.6026 13.6738 7.5486C13.7518 7.5386 13.8058 7.5346 13.8598 7.5346C14.1098 7.5346 14.3428 7.6086 14.5508 7.7526C14.8108 7.9326 14.9818 8.2066 15.0438 8.5456L16.1318 13.6776L16.1918 7.6486C16.1918 7.3076 16.3048 7.0056 16.5208 6.7776C16.7428 6.5416 17.0408 6.4166 17.3798 6.4166C17.7218 6.4166 18.0238 6.5376 18.2528 6.7676C18.4828 6.9966 18.6038 7.3026 18.6038 7.6516L18.5688 13.7016L19.5158 8.4556C19.5638 8.1296 19.7268 7.8486 19.9838 7.6576C20.1908 7.5036 20.4218 7.4256 20.6708 7.4256C20.7368 7.4256 20.8038 7.43159 20.8718 7.4426C21.1958 7.49259 21.4728 7.6556 21.6628 7.9116C21.7988 8.0936 21.9448 8.4066 21.8648 8.8606L20.9988 14.1766L22.2198 10.7096C22.3198 10.3946 22.4928 10.1486 22.7298 9.9916C22.9248 9.8616 23.1408 9.7956 23.3718 9.7956C23.4278 9.7956 23.4838 9.7996 23.5408 9.8076C23.8708 9.8646 24.1278 10.0286 24.3018 10.2856C24.4698 10.5356 24.5298 10.8336 24.4808 11.1696L23.3418 17.7446C23.0218 19.5926 22.4068 21.0076 21.5138 21.9506C20.5928 22.9246 19.2728 23.4186 17.5908 23.4186Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8523 17.66L23.9893 11.097C24.0203 10.886 23.9873 10.708 23.8893 10.564C23.7923 10.419 23.6533 10.331 23.4733 10.3C23.3013 10.276 23.1453 10.312 23.0053 10.405C22.8643 10.499 22.7583 10.655 22.6883 10.874L21.4933 14.273C21.4383 14.422 21.3623 14.527 21.2643 14.589C21.1673 14.652 21.0513 14.672 20.9193 14.648C20.7943 14.625 20.6903 14.56 20.6083 14.455C20.5263 14.349 20.4933 14.23 20.5083 14.097L21.3763 8.776C21.4153 8.55 21.3783 8.36 21.2643 8.208C21.1513 8.056 20.9933 7.964 20.7903 7.933C20.6023 7.901 20.4323 7.942 20.2803 8.056C20.1283 8.169 20.0363 8.331 20.0053 8.542L19.0673 13.851C19.0443 13.984 18.9833 14.087 18.8853 14.161C18.7883 14.236 18.6693 14.261 18.5283 14.238C18.3723 14.214 18.2573 14.155 18.1823 14.062C18.1083 13.968 18.0713 13.847 18.0713 13.698L18.1063 7.651C18.1063 7.433 18.0383 7.255 17.9013 7.118C17.7643 6.982 17.5903 6.913 17.3803 6.913C17.1763 6.913 17.0103 6.982 16.8823 7.118C16.7533 7.255 16.6883 7.433 16.6883 7.651L16.6533 13.745C16.6533 13.886 16.6043 14.003 16.5073 14.097C16.4093 14.191 16.2943 14.238 16.1613 14.238C16.0283 14.238 15.9173 14.196 15.8273 14.114C15.7373 14.032 15.6763 13.921 15.6453 13.78L14.5553 8.636C14.5163 8.425 14.4213 8.267 14.2683 8.161C14.1163 8.056 13.9463 8.015 13.7583 8.038C13.5793 8.069 13.4363 8.159 13.3313 8.308C13.2253 8.456 13.1923 8.644 13.2313 8.87L14.3333 15.902C14.3873 16.23 14.3443 16.474 14.2043 16.634C14.0633 16.795 13.8873 16.875 13.6763 16.875C13.5203 16.875 13.3803 16.832 13.2553 16.746C13.1303 16.66 13.0083 16.515 12.8913 16.312L11.2983 13.441C11.1883 13.23 11.0573 13.087 10.9053 13.013C10.7533 12.939 10.5903 12.933 10.4193 12.995C10.2313 13.058 10.1043 13.179 10.0383 13.359C9.97126 13.538 9.98526 13.741 10.0793 13.968L11.9893 18.668C12.3953 19.636 12.8683 20.435 13.4073 21.064C13.9463 21.693 14.5613 22.16 15.2533 22.464C15.9443 22.769 16.7233 22.921 17.5903 22.921C19.1373 22.921 20.3253 22.484 21.1533 21.609C21.9813 20.734 22.5483 19.418 22.8523 17.66ZM11.0283 19.007L9.16526 14.414C9.03226 14.085 8.97926 13.773 9.00726 13.476C9.03426 13.179 9.12826 12.921 9.28826 12.702C9.44826 12.484 9.64926 12.312 9.89126 12.187C10.1333 12.069 10.3973 12.015 10.6823 12.023C10.9673 12.03 11.2433 12.112 11.5083 12.269C11.7743 12.425 11.9973 12.663 12.1763 12.984L13.1023 14.754C13.1263 14.8 13.1573 14.82 13.1963 14.812C13.2353 14.804 13.2513 14.773 13.2433 14.718L12.2473 9.046C12.1763 8.679 12.1923 8.351 12.2943 8.062C12.3953 7.773 12.5593 7.538 12.7863 7.359C13.0123 7.179 13.2743 7.066 13.5713 7.019C13.8683 6.972 14.1533 7.001 14.4263 7.107C14.7003 7.212 14.9343 7.386 15.1303 7.628C15.3253 7.87 15.4623 8.171 15.5403 8.53L15.6803 9.292V7.651C15.6803 7.136 15.8413 6.714 16.1613 6.386C16.4813 6.058 16.8873 5.894 17.3803 5.894C17.8953 5.894 18.3113 6.062 18.6283 6.398C18.9443 6.734 19.1023 7.167 19.1023 7.698L19.0793 8.202C19.1883 7.734 19.4173 7.384 19.7643 7.153C20.1123 6.923 20.5013 6.843 20.9303 6.913C21.2273 6.96 21.4913 7.073 21.7213 7.253C21.9523 7.433 22.1243 7.665 22.2373 7.95C22.3503 8.235 22.3833 8.562 22.3373 8.929L22.2373 9.85652C22.2179 9.76817 22.3253 9.65233 22.5593 9.509C22.9113 9.294 23.2983 9.222 23.7193 9.292C23.9933 9.347 24.2333 9.458 24.4403 9.626C24.6473 9.794 24.7993 10.019 24.8973 10.3C24.9953 10.581 25.0123 10.901 24.9503 11.261L23.8953 17.765C23.5673 19.789 22.8833 21.334 21.8443 22.4C20.8053 23.466 19.3763 24 17.5553 24C16.0163 24 14.7163 23.58 13.6533 22.74C12.5903 21.9 11.7153 20.656 11.0283 19.007Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Hand-(Pointing).svg b/src/assets/cursors/Cursor=Hand-(Pointing).svg
new file mode 100644
index 000000000..19a70a673
--- /dev/null
+++ b/src/assets/cursors/Cursor=Hand-(Pointing).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.301 31.942C20.359 31.942 21.279 31.722 22.059 31.281C22.841 30.84 23.445 30.195 23.87 29.343C24.296 28.491 24.509 27.449 24.509 26.214V24.564C24.509 23.797 24.389 23.208 24.149 22.794C23.909 22.381 23.563 22.174 23.114 22.174V23.268C23.114 23.42 23.063 23.542 22.963 23.633C22.862 23.724 22.749 23.769 22.621 23.769C22.487 23.769 22.37 23.724 22.27 23.633C22.169 23.542 22.119 23.42 22.119 23.268V21.909C22.119 21.636 22.049 21.424 21.91 21.275C21.769 21.126 21.572 21.052 21.316 21.052C21.116 21.052 20.918 21.095 20.724 21.18V22.913C20.724 23.071 20.673 23.195 20.573 23.287C20.472 23.378 20.359 23.423 20.231 23.423C20.097 23.423 19.98 23.378 19.88 23.287C19.779 23.195 19.729 23.071 19.729 22.913V20.906C19.729 20.639 19.658 20.427 19.515 20.272C19.372 20.117 19.179 20.039 18.936 20.039C18.729 20.039 18.528 20.085 18.334 20.176V22.566C18.334 22.706 18.287 22.825 18.192 22.922C18.098 23.019 17.978 23.068 17.832 23.068C17.692 23.068 17.575 23.019 17.481 22.922C17.387 22.825 17.339 22.706 17.339 22.566V15.981C17.339 15.756 17.277 15.575 17.152 15.438C17.028 15.301 16.859 15.233 16.646 15.233C16.433 15.233 16.262 15.301 16.131 15.438C16 15.575 15.935 15.756 15.935 15.981V25.257C15.935 25.452 15.877 25.611 15.762 25.736C15.646 25.86 15.5 25.922 15.324 25.922C15.165 25.922 15.024 25.883 14.9 25.804C14.775 25.725 14.67 25.579 14.585 25.366L13.363 22.575C13.211 22.21 12.982 22.028 12.679 22.028C12.484 22.028 12.326 22.09 12.204 22.215C12.082 22.339 12.022 22.49 12.022 22.666C12.022 22.812 12.049 22.958 12.104 23.104L13.737 27.701C14.271 29.191 15.014 30.269 15.962 30.939C16.911 31.608 18.024 31.942 19.301 31.942ZM19.265 33C17.707 33 16.383 32.583 15.292 31.751C14.2 30.918 13.366 29.68 12.788 28.038L11.155 23.432C11.106 23.287 11.069 23.135 11.041 22.976C11.014 22.818 11 22.675 11 22.548C11 22.073 11.158 21.706 11.475 21.444C11.79 21.183 12.162 21.052 12.587 21.052C12.898 21.052 13.177 21.142 13.427 21.321C13.676 21.5 13.876 21.77 14.029 22.128L14.749 23.907C14.767 23.949 14.795 23.97 14.831 23.97C14.88 23.97 14.904 23.943 14.904 23.889V16.044C14.904 15.491 15.068 15.052 15.397 14.726C15.725 14.401 16.141 14.238 16.646 14.238C17.145 14.238 17.557 14.401 17.882 14.726C18.207 15.052 18.37 15.491 18.37 16.044V19.155C18.607 19.088 18.838 19.054 19.064 19.054C19.453 19.054 19.784 19.156 20.058 19.36C20.331 19.564 20.523 19.842 20.633 20.195C20.912 20.098 21.186 20.049 21.454 20.049C21.83 20.049 22.148 20.144 22.406 20.336C22.665 20.527 22.843 20.787 22.94 21.116C23.766 21.122 24.407 21.414 24.86 21.991C25.313 22.569 25.54 23.381 25.54 24.426V26.333C25.54 27.743 25.275 28.946 24.746 29.94C24.217 30.935 23.481 31.692 22.539 32.216C21.596 32.739 20.505 33 19.265 33Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.301 31.942C20.359 31.942 21.279 31.722 22.059 31.281C22.841 30.84 23.445 30.195 23.87 29.343C24.296 28.491 24.509 27.449 24.509 26.214V24.564C24.509 23.797 24.389 23.208 24.149 22.794C23.909 22.381 23.563 22.174 23.114 22.174V23.268C23.114 23.42 23.063 23.542 22.963 23.633C22.862 23.724 22.749 23.769 22.621 23.769C22.487 23.769 22.37 23.724 22.27 23.633C22.169 23.542 22.119 23.42 22.119 23.268V21.909C22.119 21.636 22.049 21.424 21.91 21.275C21.769 21.126 21.572 21.052 21.316 21.052C21.116 21.052 20.918 21.095 20.724 21.18V22.913C20.724 23.071 20.673 23.195 20.573 23.287C20.472 23.378 20.359 23.423 20.231 23.423C20.097 23.423 19.98 23.378 19.88 23.287C19.779 23.195 19.729 23.071 19.729 22.913V20.906C19.729 20.639 19.658 20.427 19.515 20.272C19.372 20.117 19.179 20.039 18.936 20.039C18.729 20.039 18.528 20.085 18.334 20.176V22.566C18.334 22.706 18.287 22.825 18.192 22.922C18.098 23.019 17.978 23.068 17.832 23.068C17.692 23.068 17.575 23.019 17.481 22.922C17.387 22.825 17.339 22.706 17.339 22.566V15.981C17.339 15.756 17.277 15.575 17.152 15.438C17.028 15.301 16.859 15.233 16.646 15.233C16.433 15.233 16.262 15.301 16.131 15.438C16 15.575 15.935 15.756 15.935 15.981V25.257C15.935 25.452 15.877 25.611 15.762 25.736C15.646 25.86 15.5 25.922 15.324 25.922C15.165 25.922 15.024 25.883 14.9 25.804C14.775 25.725 14.67 25.579 14.585 25.366L13.363 22.575C13.211 22.21 12.982 22.028 12.679 22.028C12.484 22.028 12.326 22.09 12.204 22.215C12.082 22.339 12.022 22.49 12.022 22.666C12.022 22.812 12.049 22.958 12.104 23.104L13.737 27.701C14.271 29.191 15.014 30.269 15.962 30.939C16.911 31.608 18.024 31.942 19.301 31.942Z" fill="white" style="fill:white;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Menu.svg b/src/assets/cursors/Cursor=Menu.svg
new file mode 100644
index 000000000..3489257b1
--- /dev/null
+++ b/src/assets/cursors/Cursor=Menu.svg
@@ -0,0 +1,18 @@
+<svg width="32" height="43" viewBox="0 0 32 43" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_302)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.501 13.8601L24.884 22.2611C25.937 23.3171 25.19 25.1191 23.699 25.1191L20.252 25.1181L17.784 27.3031C16.703 28.2591 15 27.4921 15 26.0481V14.4811C15 13.6971 15.947 13.3051 16.501 13.8601Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9995 15.1292V26.0262C15.9995 26.6162 16.6965 26.9302 17.1385 26.5392L19.8735 24.1182L23.6735 24.1192C24.2835 24.1192 24.5895 23.3822 24.1585 22.9502L16.2505 15.0252C16.1585 14.9322 15.9995 14.9982 15.9995 15.1292Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8888 42.1186H22.1098C20.9448 42.1186 19.9998 41.1736 19.9998 40.0076V29.2296C19.9998 28.0636 20.9448 27.1186 22.1098 27.1186H29.8888C31.0548 27.1186 31.9998 28.0636 31.9998 29.2296V40.0076C31.9998 41.1736 31.0548 42.1186 29.8888 42.1186Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7495 41.1186H22.2495C21.5595 41.1186 20.9995 40.5586 20.9995 39.8686V29.3686C20.9995 28.6786 21.5595 28.1186 22.2495 28.1186H29.7495C30.4395 28.1186 30.9995 28.6786 30.9995 29.3686V39.8686C30.9995 40.5586 30.4395 41.1186 29.7495 41.1186Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4995 31.1186H23.4995C23.2235 31.1186 22.9995 30.8946 22.9995 30.6186C22.9995 30.3426 23.2235 30.1186 23.4995 30.1186H28.4995C28.7755 30.1186 28.9995 30.3426 28.9995 30.6186C28.9995 30.8946 28.7755 31.1186 28.4995 31.1186Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4995 39.1186H23.4995C23.2235 39.1186 22.9995 38.8946 22.9995 38.6186C22.9995 38.3426 23.2235 38.1186 23.4995 38.1186H28.4995C28.7755 38.1186 28.9995 38.3426 28.9995 38.6186C28.9995 38.8946 28.7755 39.1186 28.4995 39.1186Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0608 36.1186H22.9378C22.4198 36.1186 21.9998 35.6986 21.9998 35.1796V34.0576C21.9998 33.5386 22.4198 33.1186 22.9378 33.1186H29.0608C29.5788 33.1186 29.9998 33.5386 29.9998 34.0576V35.1796C29.9998 35.6986 29.5788 36.1186 29.0608 36.1186Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.4995 35.1186H23.4995C23.2235 35.1186 22.9995 34.8946 22.9995 34.6186C22.9995 34.3426 23.2235 34.1186 23.4995 34.1186H26.4995C26.7755 34.1186 26.9995 34.3426 26.9995 34.6186C26.9995 34.8946 26.7755 35.1186 26.4995 35.1186Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</g>
+<defs>
+<clipPath id="clip0_1_302">
+<rect width="16.9998" height="28.5186" fill="white" style="fill:white;fill-opacity:1;" transform="translate(15 13.6)"/>
+</clipPath>
+</defs>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Move.svg b/src/assets/cursors/Cursor=Move.svg
new file mode 100644
index 000000000..50e56b767
--- /dev/null
+++ b/src/assets/cursors/Cursor=Move.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0764 8.5093C16.5864 7.9993 17.4134 7.9993 17.9234 8.5093L25.4904 16.0763C26.0004 16.5863 26.0004 17.4133 25.4904 17.9233L17.9234 25.4903C17.4134 26.0003 16.5864 26.0003 16.0764 25.4903L8.50939 17.9233C7.99939 17.4133 7.99939 16.5863 8.50939 16.0763L16.0764 8.5093Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.0004 19.8444C13.0004 20.2704 12.4844 20.4844 12.1824 20.1824L9.4064 17.4064C9.1824 17.1824 9.1824 16.8184 9.4064 16.5934L12.1824 13.8174C12.4844 13.5154 13.0004 13.7294 13.0004 14.1554L13.001 16H16V13L14.1556 13.0004C13.758 13.0004 13.5451 12.5509 13.764 12.2454L13.8176 12.1824L16.5936 9.4064C16.8176 9.1824 17.1816 9.1824 17.4066 9.4064L20.1826 12.1824C20.4846 12.4844 20.2706 13.0004 19.8446 13.0004L18 13V16H21V14.1556C21 13.758 21.4495 13.5451 21.7542 13.764L21.817 13.8176L24.594 16.5936C24.818 16.8176 24.818 17.1816 24.594 17.4066L21.817 20.1826C21.516 20.4846 21 20.2706 21 19.8446V18H18V20.999L19.8444 20.9996C20.242 20.9996 20.4549 21.4491 20.236 21.7546L20.1824 21.8176L17.4064 24.5936C17.1824 24.8176 16.8184 24.8176 16.5934 24.5936L13.8174 21.8176C13.5154 21.5156 13.7294 20.9996 14.1554 20.9996L16 20.999V18H13.001L13.0004 19.8444Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-(Down).svg b/src/assets/cursors/Cursor=Resize-(Down).svg
new file mode 100644
index 000000000..fba367294
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-(Down).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23 16C23 17.103 22.103 18 21 18H11C9.897 18 9 17.103 9 16C9 14.897 9.897 14 11 14H21C22.103 14 23 14.897 23 16ZM19.7852 21.3564C19.7852 21.5684 19.7342 21.7824 19.6392 21.9734L17.2562 26.7354C17.0212 27.2064 16.5482 27.4994 16.0212 27.5004C15.4932 27.5004 15.0192 27.2074 14.7842 26.7364L12.4012 21.9744C12.3052 21.7834 12.2542 21.5694 12.2542 21.3564C12.2542 20.5934 12.8752 19.9734 13.6382 19.9734H18.4022C18.7812 19.9734 19.1352 20.1234 19.3972 20.3964C19.6472 20.6554 19.7852 20.9974 19.7852 21.3564Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 16C22 16.552 21.552 17 21 17H11C10.448 17 10 16.552 10 16C10 15.448 10.448 15 11 15H21C21.552 15 22 15.448 22 16ZM16.362 26.2884L18.744 21.5274C18.871 21.2734 18.686 20.9734 18.402 20.9734H13.638C13.353 20.9734 13.168 21.2734 13.295 21.5274L15.678 26.2884C15.819 26.5704 16.221 26.5704 16.362 26.2884Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-(Left).svg b/src/assets/cursors/Cursor=Resize-(Left).svg
new file mode 100644
index 000000000..6e21fb77d
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-(Left).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0004 23C14.8974 23 14.0004 22.103 14.0004 21V11C14.0004 9.897 14.8974 9 16.0004 9C17.1034 9 18.0004 9.897 18.0004 11V21C18.0004 22.103 17.1034 23 16.0004 23ZM10.644 19.7852C10.432 19.7852 10.218 19.7342 10.027 19.6392L5.265 17.2562C4.794 17.0212 4.501 16.5482 4.5 16.0212C4.5 15.4932 4.793 15.0192 5.264 14.7842L10.026 12.4012C10.217 12.3052 10.431 12.2542 10.644 12.2542C11.407 12.2542 12.027 12.8752 12.027 13.6382V18.4022C12.027 18.7812 11.877 19.1352 11.604 19.3972C11.345 19.6472 11.003 19.7852 10.644 19.7852Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0004 22C15.4484 22 15.0004 21.552 15.0004 21V11C15.0004 10.448 15.4484 10 16.0004 10C16.5524 10 17.0004 10.448 17.0004 11V21C17.0004 21.552 16.5524 22 16.0004 22ZM5.712 16.362L10.473 18.744C10.727 18.871 11.027 18.686 11.027 18.402V13.638C11.027 13.353 10.727 13.168 10.473 13.295L5.712 15.678C5.43 15.819 5.43 16.221 5.712 16.362Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-(Left-Right).svg b/src/assets/cursors/Cursor=Resize-(Left-Right).svg
new file mode 100644
index 000000000..7021d2297
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-(Left-Right).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 23C14.8996 23 14.0047 22.103 14.0047 21V11C14.0047 9.897 14.8996 9 16 9C17.1004 9 17.9953 9.897 17.9953 11V21C17.9953 22.103 17.1004 23 16 23ZM21.3703 19.7852C20.6091 19.7852 19.9905 19.1652 19.9905 18.4022V13.6382C19.9905 12.8752 20.6091 12.2542 21.3703 12.2542C21.5828 12.2542 21.7973 12.3052 21.9878 12.4022L26.7368 14.7842C27.2077 15.0192 27.5 15.4932 27.5 16.0212C27.499 16.5482 27.2067 17.0212 26.7358 17.2572L21.9868 19.6392C21.7963 19.7342 21.5828 19.7852 21.3703 19.7852ZM10.6297 19.7852C10.4182 19.7852 10.2047 19.7342 10.0141 19.6392L5.26322 17.2562C4.79332 17.0212 4.501 16.5482 4.5 16.0212C4.5 15.4932 4.79232 15.0192 5.26222 14.7842L10.0132 12.4012C10.2037 12.3052 10.4172 12.2542 10.6297 12.2542C11.3909 12.2542 12.0095 12.8752 12.0095 13.6382V18.4022C12.0095 18.7812 11.8598 19.1352 11.5875 19.3972C11.3291 19.6472 10.9879 19.7852 10.6297 19.7852Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 22C15.4493 22 15.0023 21.552 15.0023 21V11C15.0023 10.448 15.4493 10 16 10C16.5507 10 16.9977 10.448 16.9977 11V21C16.9977 21.552 16.5507 22 16 22ZM26.2908 15.6775L21.5409 13.2955C21.2875 13.1685 20.9882 13.3535 20.9882 13.6375V18.4015C20.9882 18.6865 21.2875 18.8715 21.5409 18.7445L26.2908 16.3615C26.5722 16.2205 26.5722 15.8185 26.2908 15.6775ZM5.70918 16.362L10.4591 18.744C10.7125 18.871 11.0118 18.686 11.0118 18.402V13.638C11.0118 13.353 10.7125 13.168 10.4591 13.295L5.70918 15.678C5.42783 15.819 5.42783 16.221 5.70918 16.362Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-(Right).svg b/src/assets/cursors/Cursor=Resize-(Right).svg
new file mode 100644
index 000000000..1ce801ce1
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-(Right).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 9C17.103 9 18 9.897 18 11V21C18 22.103 17.103 23 16 23C14.897 23 14 22.103 14 21V11C14 9.897 14.897 9 16 9ZM21.3564 12.2148C21.5684 12.2148 21.7824 12.2658 21.9734 12.3608L26.7354 14.7438C27.2064 14.9788 27.4994 15.4518 27.5004 15.9788C27.5004 16.5068 27.2074 16.9808 26.7364 17.2158L21.9744 19.5988C21.7834 19.6948 21.5694 19.7458 21.3564 19.7458C20.5934 19.7458 19.9734 19.1248 19.9734 18.3618V13.5978C19.9734 13.2188 20.1234 12.8648 20.3964 12.6028C20.6554 12.3528 20.9974 12.2148 21.3564 12.2148Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 10C16.552 10 17 10.448 17 11V21C17 21.552 16.552 22 16 22C15.448 22 15 21.552 15 21V11C15 10.448 15.448 10 16 10ZM26.2884 15.638L21.5274 13.256C21.2734 13.129 20.9734 13.314 20.9734 13.598V18.362C20.9734 18.647 21.2734 18.832 21.5274 18.705L26.2884 16.322C26.5704 16.181 26.5704 15.779 26.2884 15.638Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-(Up).svg b/src/assets/cursors/Cursor=Resize-(Up).svg
new file mode 100644
index 000000000..9c4ac0f00
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-(Up).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 16.0004C9 14.8974 9.897 14.0004 11 14.0004H21C22.103 14.0004 23 14.8974 23 16.0004C23 17.1034 22.103 18.0004 21 18.0004H11C9.897 18.0004 9 17.1034 9 16.0004ZM12.2148 10.644C12.2148 10.432 12.2658 10.218 12.3608 10.027L14.7438 5.265C14.9788 4.794 15.4518 4.501 15.9788 4.5C16.5068 4.5 16.9808 4.793 17.2158 5.264L19.5988 10.026C19.6948 10.217 19.7458 10.431 19.7458 10.644C19.7458 11.407 19.1248 12.027 18.3618 12.027H13.5978C13.2188 12.027 12.8648 11.877 12.6028 11.604C12.3528 11.345 12.2148 11.003 12.2148 10.644Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 16.0004C10 15.4484 10.448 15.0004 11 15.0004H21C21.552 15.0004 22 15.4484 22 16.0004C22 16.5524 21.552 17.0004 21 17.0004H11C10.448 17.0004 10 16.5524 10 16.0004ZM15.638 5.712L13.256 10.473C13.129 10.727 13.314 11.027 13.598 11.027H18.362C18.647 11.027 18.832 10.727 18.705 10.473L16.322 5.712C16.181 5.43 15.779 5.43 15.638 5.712Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-(Up-Down).svg b/src/assets/cursors/Cursor=Resize-(Up-Down).svg
new file mode 100644
index 000000000..b01a40e3a
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-(Up-Down).svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23 16C23 17.1004 22.103 17.9953 21 17.9953H11C9.897 17.9953 9 17.1004 9 16C9 14.8996 9.897 14.0047 11 14.0047H21C22.103 14.0047 23 14.8996 23 16ZM19.7852 10.6297C19.7852 11.3909 19.1652 12.0095 18.4022 12.0095H13.6382C12.8752 12.0095 12.2542 11.3909 12.2542 10.6297C12.2542 10.4172 12.3052 10.2027 12.4022 10.0122L14.7842 5.26322C15.0192 4.79232 15.4932 4.5 16.0212 4.5C16.5482 4.501 17.0212 4.79332 17.2572 5.26422L19.6392 10.0132C19.7342 10.2037 19.7852 10.4172 19.7852 10.6297ZM19.7852 21.3703C19.7852 21.5818 19.7342 21.7953 19.6392 21.9859L17.2562 26.7368C17.0212 27.2067 16.5482 27.499 16.0212 27.5C15.4932 27.5 15.0192 27.2077 14.7842 26.7378L12.4012 21.9868C12.3052 21.7963 12.2542 21.5828 12.2542 21.3703C12.2542 20.6091 12.8752 19.9905 13.6382 19.9905H18.4022C18.7812 19.9905 19.1352 20.1402 19.3972 20.4125C19.6472 20.6709 19.7852 21.0121 19.7852 21.3703Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 16C22 16.5507 21.552 16.9977 21 16.9977H11C10.448 16.9977 10 16.5507 10 16C10 15.4493 10.448 15.0023 11 15.0023H21C21.552 15.0023 22 15.4493 22 16ZM15.6775 5.70918L13.2955 10.4591C13.1685 10.7125 13.3535 11.0118 13.6375 11.0118H18.4015C18.6865 11.0118 18.8715 10.7125 18.7445 10.4591L16.3615 5.70918C16.2205 5.42783 15.8185 5.42783 15.6775 5.70918ZM16.362 26.2908L18.744 21.5409C18.871 21.2875 18.686 20.9882 18.402 20.9882H13.638C13.353 20.9882 13.168 21.2875 13.295 21.5409L15.678 26.2908C15.819 26.5722 16.221 26.5722 16.362 26.2908Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-North-East-South-West.svg b/src/assets/cursors/Cursor=Resize-North-East-South-West.svg
new file mode 100644
index 000000000..1185c1fff
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-North-East-South-West.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.64 15.4658L16.5353 19.3601C16.8182 19.643 16.9701 20.0188 16.9621 20.4176C16.9551 20.7994 16.8042 21.1573 16.5353 21.4261C16.3754 21.5841 16.1785 21.707 15.9636 21.778L10.1241 23.7241C9.59533 23.9 9.02258 23.7651 8.62875 23.3713C8.23492 22.9774 8.09998 22.4037 8.2759 21.8759L10.2221 16.0366C10.293 15.8217 10.415 15.6238 10.5739 15.4648C11.1437 14.8961 12.0703 14.8961 12.64 15.4658ZM23.3713 8.62873C23.7651 9.02255 23.9 9.59529 23.7241 10.1231L21.781 15.9614C21.71 16.1763 21.587 16.3732 21.4281 16.5322C20.8584 17.1019 19.9318 17.1019 19.362 16.5322L15.4677 12.6379C14.8979 12.0692 14.8979 11.1426 15.4677 10.5718C15.6266 10.4129 15.8245 10.292 16.0394 10.22L21.8769 8.27589C22.4047 8.09997 22.9774 8.2349 23.3713 8.62873Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.80824 22.7821L15.6512 20.8351C15.9762 20.7271 16.0732 20.3141 15.8312 20.0721L11.9352 16.1761C11.6932 15.9331 11.2802 16.0311 11.1712 16.3561L9.22524 22.1991C9.10524 22.5591 9.44824 22.9021 9.80824 22.7821ZM22.199 9.22462L16.358 11.1696C16.033 11.2776 15.936 11.6906 16.178 11.9336L20.074 15.8286C20.316 16.0716 20.729 15.9736 20.837 15.6486L22.782 9.80762C22.902 9.44762 22.559 9.10462 22.199 9.22462Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-North-South.svg b/src/assets/cursors/Cursor=Resize-North-South.svg
new file mode 100644
index 000000000..57eaa0563
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-North-South.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.204 19.4693C20.203 19.6943 20.15 19.9203 20.049 20.1223L17.294 25.6303C17.045 26.1283 16.544 26.4383 15.987 26.4383C15.43 26.4383 14.929 26.1283 14.68 25.6303L11.925 20.1223C11.824 19.9203 11.77 19.6943 11.77 19.4693C11.77 18.6633 12.426 18.0083 13.232 18.0083H18.742C19.142 18.0083 19.517 18.1663 19.793 18.4543C20.058 18.7283 20.204 19.0893 20.204 19.4693ZM20.2031 12.546C20.2031 13.352 19.5481 14.008 18.7411 14.008H13.2321C12.4261 14.008 11.7701 13.353 11.7701 12.546C11.7701 12.321 11.8241 12.096 11.9251 11.893L14.6801 6.388C14.9291 5.89 15.4301 5.58 15.9871 5.58C16.5441 5.58 17.0451 5.89 17.2941 6.388L20.0491 11.893C20.1501 12.095 20.2031 12.321 20.2031 12.546Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3992 25.1833L19.1542 19.6753C19.3072 19.3683 19.0842 19.0083 18.7412 19.0083H13.2322C12.8892 19.0083 12.6662 19.3683 12.8192 19.6753L15.5742 25.1833C15.7442 25.5233 16.2292 25.5233 16.3992 25.1833ZM15.5743 6.8351L12.8193 12.3401C12.6663 12.6471 12.8893 13.0081 13.2323 13.0081H18.7413C19.0843 13.0081 19.3073 12.6471 19.1543 12.3401L16.3993 6.8351C16.2293 6.4951 15.7443 6.4951 15.5743 6.8351Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-North-West-South-East.svg b/src/assets/cursors/Cursor=Resize-North-West-South-East.svg
new file mode 100644
index 000000000..f00fc8797
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-North-West-South-East.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.36 15.4658C19.9297 14.8961 20.8563 14.8961 21.4261 15.4648C21.585 15.6238 21.707 15.8217 21.7779 16.0366L23.7241 21.8759C23.9 22.4037 23.7651 22.9774 23.3713 23.3713C22.9774 23.7651 22.4047 23.9 21.8759 23.7241L16.0364 21.778C15.8215 21.707 15.6246 21.5841 15.4647 21.4261C15.1958 21.1573 15.0449 20.7994 15.0379 20.4176C15.0299 20.0188 15.1818 19.643 15.4647 19.3601L19.36 15.4658ZM8.62873 8.62873C9.02256 8.2349 9.59532 8.09997 10.1231 8.27589L15.9606 10.22C16.1755 10.292 16.3734 10.4129 16.5323 10.5718C17.1021 11.1426 17.1021 12.0692 16.5323 12.6379L12.638 16.5322C12.0682 17.1019 11.1416 17.1019 10.5719 16.5322C10.413 16.3732 10.29 16.1763 10.219 15.9614L8.27589 10.1231C8.09996 9.59529 8.2349 9.02255 8.62873 8.62873Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.1926 22.7755L16.3521 20.8294C16.0272 20.7215 15.9303 20.3087 16.1722 20.0668L20.0665 16.1725C20.3084 15.9296 20.7212 16.0276 20.8302 16.3524L22.7753 22.1928C22.8953 22.5526 22.5524 22.8955 22.1926 22.7755ZM9.80703 9.22416L15.6455 11.1683C15.9704 11.2762 16.0683 11.689 15.8254 11.9319L11.9311 15.8252C11.6892 16.0681 11.2764 15.9701 11.1684 15.6453L9.22428 9.80689C9.10433 9.44706 9.44718 9.10421 9.80703 9.22416Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Resize-West-East.svg b/src/assets/cursors/Cursor=Resize-West-East.svg
new file mode 100644
index 000000000..ef1929fbe
--- /dev/null
+++ b/src/assets/cursors/Cursor=Resize-West-East.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.7634 12C19.9884 12.001 20.2144 12.054 20.4164 12.155L25.9244 14.91C26.4224 15.159 26.7324 15.66 26.7324 16.217C26.7324 16.774 26.4224 17.275 25.9244 17.524L20.4164 20.279C20.2144 20.38 19.9884 20.434 19.7634 20.434C18.9574 20.434 18.3024 19.778 18.3024 18.972V13.462C18.3024 13.062 18.4604 12.687 18.7484 12.411C19.0224 12.146 19.3834 12 19.7634 12ZM12.84 12.001C13.646 12.001 14.302 12.656 14.302 13.463V18.972C14.302 19.778 13.647 20.434 12.84 20.434C12.615 20.434 12.39 20.38 12.187 20.279L6.68199 17.524C6.18399 17.275 5.87399 16.774 5.87399 16.217C5.87399 15.66 6.18399 15.159 6.68199 14.91L12.187 12.155C12.389 12.054 12.615 12.001 12.84 12.001Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.4773 15.8049L19.9693 13.0499C19.6623 12.8969 19.3023 13.1199 19.3023 13.4629V18.9719C19.3023 19.3149 19.6623 19.5379 19.9693 19.3849L25.4773 16.6299C25.8173 16.4599 25.8173 15.9749 25.4773 15.8049ZM7.12921 16.6298L12.6342 19.3848C12.9412 19.5378 13.3022 19.3148 13.3022 18.9718V13.4628C13.3022 13.1198 12.9412 12.8968 12.6342 13.0498L7.12921 15.8048C6.78921 15.9748 6.78921 16.4598 7.12921 16.6298Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Text-Cursor.svg b/src/assets/cursors/Cursor=Text-Cursor.svg
new file mode 100644
index 000000000..1bfd0809f
--- /dev/null
+++ b/src/assets/cursors/Cursor=Text-Cursor.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.315 7.5046C20.315 8.2486 19.759 8.8886 19.023 8.9936C18.431 9.0786 17.984 9.5956 17.984 10.1956V20.4256C17.984 21.0266 18.43 21.5436 19.021 21.6286C19.756 21.7326 20.312 22.3736 20.312 23.1176C20.309 23.5606 20.118 23.9736 19.787 24.2566C19.458 24.5396 19.021 24.6676 18.59 24.6036C17.807 24.4916 17.078 24.1606 16.481 23.6586C15.883 24.1606 15.154 24.4916 14.367 24.6046C13.94 24.6676 13.504 24.5406 13.173 24.2566C12.842 23.9696 12.653 23.5576 12.65 23.1246C12.65 22.3736 13.206 21.7326 13.942 21.6276C14.536 21.5426 14.984 21.0256 14.984 20.4256V10.1956C14.984 9.5956 14.537 9.0786 13.944 8.9936C13.209 8.8886 12.654 8.2486 12.654 7.5046C12.655 7.0646 12.846 6.6506 13.177 6.3656C13.447 6.1326 13.796 6.0016 14.158 6.0016H14.239L14.39 6.0206C15.164 6.1316 15.889 6.4616 16.484 6.9636C17.083 6.4616 17.812 6.1296 18.598 6.0176C19.013 5.9506 19.455 6.0766 19.792 6.3656C20.123 6.6526 20.312 7.0646 20.315 7.4976V7.5016V7.5046Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.087 8.00285C15.169 8.15785 15.985 9.10085 15.985 10.1949V20.4249C15.985 21.5189 15.167 22.4619 14.083 22.6169C13.836 22.6519 13.65 22.8669 13.65 23.1169C13.651 23.2629 13.714 23.4009 13.824 23.4969C13.935 23.5909 14.08 23.6349 14.226 23.6139C15.148 23.4819 15.978 22.9429 16.481 22.1599C16.985 22.9429 17.814 23.4819 18.737 23.6139C18.879 23.6349 19.027 23.5909 19.137 23.4959C19.248 23.4009 19.311 23.2629 19.312 23.1169C19.312 22.8669 19.126 22.6519 18.879 22.6169C17.799 22.4619 16.985 21.5199 16.985 20.4249V10.1949C16.985 9.10085 17.801 8.15785 18.883 8.00285C19.13 7.96785 19.316 7.75285 19.316 7.50285C19.315 7.35785 19.251 7.21885 19.141 7.12285C19.03 7.02885 18.885 6.98285 18.74 7.00585C17.818 7.13885 16.988 7.67685 16.484 8.45985C15.98 7.67685 15.151 7.13885 14.229 7.00585C14.206 7.00285 14.182 7.00085 14.158 7.00085C14.038 7.00085 13.921 7.04385 13.829 7.12285C13.718 7.21885 13.655 7.35685 13.654 7.50385C13.654 7.75285 13.84 7.96785 14.087 8.00285Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Zoom-In.svg b/src/assets/cursors/Cursor=Zoom-In.svg
new file mode 100644
index 000000000..8ec9b3ce5
--- /dev/null
+++ b/src/assets/cursors/Cursor=Zoom-In.svg
@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 17C24 20.866 20.866 24 17 24C13.134 24 10 20.866 10 17C10 13.134 13.134 10 17 10C20.866 10 24 13.134 24 17Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.2532 17C22.2532 19.901 19.9012 22.253 17.0002 22.253C14.0982 22.253 11.7472 19.901 11.7472 17C11.7472 14.099 14.0982 11.747 17.0002 11.747C19.9012 11.747 22.2532 14.099 22.2532 17Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 20.5C16.448 20.5 16 20.052 16 19.5V14.5C16 13.948 16.448 13.5 17 13.5C17.552 13.5 18 13.948 18 14.5V19.5C18 20.052 17.552 20.5 17 20.5Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 17C13.5 16.448 13.948 16 14.5 16H19.5C20.052 16 20.5 16.448 20.5 17C20.5 17.552 20.052 18 19.5 18H14.5C13.948 18 13.5 17.552 13.5 17Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.9315 26.9316C27.3215 26.5416 27.3215 25.9076 26.9315 25.5176L22.1895 20.7756L20.7755 22.1896L25.5175 26.9316C25.9075 27.3216 26.5415 27.3216 26.9315 26.9316Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/assets/cursors/Cursor=Zoom-Out.svg b/src/assets/cursors/Cursor=Zoom-Out.svg
new file mode 100644
index 000000000..810878bad
--- /dev/null
+++ b/src/assets/cursors/Cursor=Zoom-Out.svg
@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 17C24 20.866 20.866 24 17 24C13.134 24 10 20.866 10 17C10 13.134 13.134 10 17 10C20.866 10 24 13.134 24 17Z" fill="black" style="fill:black;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.2532 17C22.2532 19.901 19.9012 22.253 17.0002 22.253C14.0982 22.253 11.7472 19.901 11.7472 17C11.7472 14.099 14.0982 11.747 17.0002 11.747C19.9012 11.747 22.2532 14.099 22.2532 17Z" fill="white" style="fill:white;fill-opacity:1;"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 17C13.5 16.448 13.948 16 14.5 16H19.5C20.052 16 20.5 16.448 20.5 17C20.5 17.552 20.052 18 19.5 18H14.5C13.948 18 13.5 17.552 13.5 17ZM26.9315 26.9316C27.3215 26.5416 27.3215 25.9076 26.9315 25.5176L22.1895 20.7756L20.7755 22.1896L25.5175 26.9316C25.9075 27.3216 26.5415 27.3216 26.9315 26.9316Z" fill="black" style="fill:black;fill-opacity:1;"/>
+</svg>
+
diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsx
index 1ffa0f48d..c373bf9a9 100644
--- a/src/components/video-editor/SettingsPanel.tsx
+++ b/src/components/video-editor/SettingsPanel.tsx
@@ -240,6 +240,18 @@ interface SettingsPanelProps {
 	webcamSizePreset?: WebcamSizePreset;
 	onWebcamSizePresetChange?: (size: WebcamSizePreset) => void;
 	onWebcamSizePresetCommit?: () => void;
+	// Cursor settings
+	showCursor?: boolean;
+	onShowCursorChange?: (show: boolean) => void;
+	cursorSize?: number;
+	onCursorSizeChange?: (size: number) => void;
+	cursorSmoothing?: number;
+	onCursorSmoothingChange?: (smoothing: number) => void;
+	cursorMotionBlur?: number;
+	onCursorMotionBlurChange?: (blur: number) => void;
+	cursorClickBounce?: number;
+	onCursorClickBounceChange?: (bounce: number) => void;
+	hasCursorData?: boolean;
 }
 
 export default SettingsPanel;
@@ -327,6 +339,17 @@ export function SettingsPanel({
 	webcamSizePreset = DEFAULT_WEBCAM_SIZE_PRESET,
 	onWebcamSizePresetChange,
 	onWebcamSizePresetCommit,
+	showCursor = true,
+	onShowCursorChange,
+	cursorSize = 3.0,
+	onCursorSizeChange,
+	cursorSmoothing = 0.67,
+	onCursorSmoothingChange,
+	cursorMotionBlur = 0.35,
+	onCursorMotionBlurChange,
+	cursorClickBounce = 2.5,
+	onCursorClickBounceChange,
+	hasCursorData = false,
 }: SettingsPanelProps) {
 	const t = useScopedT("settings");
 	// Resolved URLs are for DOM rendering only (backgroundImage). The canonical
@@ -458,6 +481,7 @@ export function SettingsPanel({
 		},
 		[cropRegion, videoWidth, videoHeight],
 	);
+	const [showCropDropdown, setShowCropDropdown] = useState(false);
 
 	const zoomEnabled = Boolean(selectedZoomDepth);
 	const trimEnabled = Boolean(selectedTrimId);
@@ -521,20 +545,6 @@ export function SettingsPanel({
 		}
 	};
 
-	const handleCropToggle = () => {
-		if (!showCropModal && cropRegion) {
-			cropSnapshotRef.current = { ...cropRegion };
-		}
-		setShowCropModal(!showCropModal);
-	};
-
-	const handleCropCancel = () => {
-		if (cropSnapshotRef.current && onCropChange) {
-			onCropChange(cropSnapshotRef.current);
-		}
-		setShowCropModal(false);
-	};
-
 	// Find selected annotation
 	const selectedAnnotation = selectedAnnotationId
 		? annotationRegions.find((a) => a.id === selectedAnnotationId)
@@ -1218,7 +1228,7 @@ export function SettingsPanel({
 							)}
 
 							<Button
-								onClick={handleCropToggle}
+								onClick={() => setShowCropDropdown(!showCropDropdown)}
 								variant="outline"
 								className="w-full mt-2 gap-1.5 bg-white/5 text-slate-200 border-white/10 hover:bg-white/10 hover:border-white/20 hover:text-white text-[10px] h-8 transition-all"
 							>
@@ -1228,6 +1238,98 @@ export function SettingsPanel({
 						</AccordionContent>
 					</AccordionItem>
 
+					{hasCursorData && (
+						<AccordionItem
+							value="cursor"
+							className="border-white/5 rounded-xl bg-white/[0.02] px-3"
+						>
+							<AccordionTrigger className="py-2.5 hover:no-underline">
+								<div className="flex items-center gap-2">
+									<Star className="w-4 h-4 text-[#34B27B]" />
+									<span className="text-xs font-medium">Cursor</span>
+								</div>
+							</AccordionTrigger>
+							<AccordionContent className="pb-3">
+								<div className="flex items-center justify-between p-2 rounded-lg bg-white/5 border border-white/5 mb-3">
+									<div className="text-[10px] font-medium text-slate-300">Show Cursor</div>
+									<Switch
+										checked={showCursor}
+										onCheckedChange={onShowCursorChange}
+										className="data-[state=checked]:bg-[#34B27B] scale-90"
+									/>
+								</div>
+								{showCursor && (
+									<div className="grid grid-cols-2 gap-2">
+										<div className="p-2 rounded-lg bg-white/5 border border-white/5">
+											<div className="flex items-center justify-between mb-1">
+												<div className="text-[10px] font-medium text-slate-300">Size</div>
+												<span className="text-[10px] text-slate-500 font-mono">
+													{cursorSize.toFixed(1)}
+												</span>
+											</div>
+											<Slider
+												value={[cursorSize]}
+												onValueChange={(values) => onCursorSizeChange?.(values[0])}
+												min={0.5}
+												max={10}
+												step={0.1}
+												className="w-full [&_[role=slider]]:bg-[#34B27B] [&_[role=slider]]:border-[#34B27B] [&_[role=slider]]:h-3 [&_[role=slider]]:w-3"
+											/>
+										</div>
+										<div className="p-2 rounded-lg bg-white/5 border border-white/5">
+											<div className="flex items-center justify-between mb-1">
+												<div className="text-[10px] font-medium text-slate-300">Smoothing</div>
+												<span className="text-[10px] text-slate-500 font-mono">
+													{Math.round(cursorSmoothing * 100)}%
+												</span>
+											</div>
+											<Slider
+												value={[cursorSmoothing]}
+												onValueChange={(values) => onCursorSmoothingChange?.(values[0])}
+												min={0}
+												max={1}
+												step={0.01}
+												className="w-full [&_[role=slider]]:bg-[#34B27B] [&_[role=slider]]:border-[#34B27B] [&_[role=slider]]:h-3 [&_[role=slider]]:w-3"
+											/>
+										</div>
+										<div className="p-2 rounded-lg bg-white/5 border border-white/5">
+											<div className="flex items-center justify-between mb-1">
+												<div className="text-[10px] font-medium text-slate-300">Motion Blur</div>
+												<span className="text-[10px] text-slate-500 font-mono">
+													{Math.round(cursorMotionBlur * 100)}%
+												</span>
+											</div>
+											<Slider
+												value={[cursorMotionBlur]}
+												onValueChange={(values) => onCursorMotionBlurChange?.(values[0])}
+												min={0}
+												max={1}
+												step={0.01}
+												className="w-full [&_[role=slider]]:bg-[#34B27B] [&_[role=slider]]:border-[#34B27B] [&_[role=slider]]:h-3 [&_[role=slider]]:w-3"
+											/>
+										</div>
+										<div className="p-2 rounded-lg bg-white/5 border border-white/5">
+											<div className="flex items-center justify-between mb-1">
+												<div className="text-[10px] font-medium text-slate-300">Click Bounce</div>
+												<span className="text-[10px] text-slate-500 font-mono">
+													{cursorClickBounce.toFixed(1)}
+												</span>
+											</div>
+											<Slider
+												value={[cursorClickBounce]}
+												onValueChange={(values) => onCursorClickBounceChange?.(values[0])}
+												min={0}
+												max={5}
+												step={0.1}
+												className="w-full [&_[role=slider]]:bg-[#34B27B] [&_[role=slider]]:border-[#34B27B] [&_[role=slider]]:h-3 [&_[role=slider]]:w-3"
+											/>
+										</div>
+									</div>
+								)}
+							</AccordionContent>
+						</AccordionItem>
+					)}
+
 					<AccordionItem
 						value="background"
 						className="border-white/5 rounded-xl bg-white/[0.02] px-3"
@@ -1380,11 +1482,11 @@ export function SettingsPanel({
 				</Accordion>
 			</div>
 
-			{showCropModal && cropRegion && onCropChange && (
+			{showCropDropdown && cropRegion && onCropChange && (
 				<>
 					<div
 						className="fixed inset-0 bg-black/80 backdrop-blur-sm z-50 animate-in fade-in duration-200"
-						onClick={handleCropCancel}
+						onClick={() => setShowCropDropdown(false)}
 					/>
 					<div className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-[60] bg-[#09090b] rounded-2xl shadow-2xl border border-white/10 p-8 w-[90vw] max-w-5xl max-h-[90vh] overflow-auto animate-in zoom-in-95 duration-200">
 						<div className="flex items-center justify-between mb-6">
@@ -1395,7 +1497,7 @@ export function SettingsPanel({
 							<Button
 								variant="ghost"
 								size="icon"
-								onClick={handleCropCancel}
+								onClick={() => setShowCropDropdown(false)}
 								className="hover:bg-white/10 text-slate-400 hover:text-white"
 							>
 								<X className="w-5 h-5" />
@@ -1491,7 +1593,7 @@ export function SettingsPanel({
 
 							<div className="flex justify-end">
 								<Button
-									onClick={() => setShowCropModal(false)}
+									onClick={() => setShowCropDropdown(false)}
 									size="lg"
 									className="bg-[#34B27B] hover:bg-[#34B27B]/90 text-white"
 								>
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index fd2188818..cf7361291 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -62,6 +62,10 @@ import {
 	DEFAULT_ANNOTATION_SIZE,
 	DEFAULT_ANNOTATION_STYLE,
 	DEFAULT_BLUR_DATA,
+	DEFAULT_CURSOR_CLICK_BOUNCE,
+	DEFAULT_CURSOR_MOTION_BLUR,
+	DEFAULT_CURSOR_SIZE,
+	DEFAULT_CURSOR_SMOOTHING,
 	DEFAULT_FIGURE_DATA,
 	DEFAULT_PLAYBACK_SPEED,
 	DEFAULT_ZOOM_DEPTH,
@@ -148,7 +152,13 @@ export default function VideoEditor() {
 	} | null>(null);
 	const [isFullscreen, setIsFullscreen] = useState(false);
 
-	const playerContainerRef = useRef<HTMLDivElement>(null);
+	// Cursor & motion blur visual settings (non-undoable preferences)
+	const [showCursor, setShowCursor] = useState(true);
+	const [cursorSize, setCursorSize] = useState(DEFAULT_CURSOR_SIZE);
+	const [cursorSmoothing, setCursorSmoothing] = useState(DEFAULT_CURSOR_SMOOTHING);
+	const [cursorMotionBlur, setCursorMotionBlur] = useState(DEFAULT_CURSOR_MOTION_BLUR);
+	const [cursorClickBounce, setCursorClickBounce] = useState(DEFAULT_CURSOR_CLICK_BOUNCE);
+
 	const videoPlaybackRef = useRef<VideoPlaybackRef>(null);
 
 	const nextZoomIdRef = useRef(1);
@@ -200,12 +210,7 @@ export default function VideoEditor() {
 			}
 
 			const project = candidate;
-			const media = resolveProjectMedia(project);
-			if (!media) {
-				return false;
-			}
-			const sourcePath = fromFileUrl(media.screenVideoPath);
-			const webcamSourcePath = media.webcamVideoPath ? fromFileUrl(media.webcamVideoPath) : null;
+			const sourcePath = project.videoPath;
 			const normalizedEditor = normalizeProjectEditor(project.editor);
 
 			try {
@@ -383,11 +388,8 @@ export default function VideoEditor() {
 
 				const result = await window.electronAPI.getCurrentVideoPath();
 				if (result.success && result.path) {
-					const sourcePath = fromFileUrl(result.path);
-					setVideoSourcePath(sourcePath);
-					setVideoPath(toFileUrl(sourcePath));
-					setWebcamVideoSourcePath(null);
-					setWebcamVideoPath(null);
+					setVideoSourcePath(result.path);
+					setVideoPath(toFileUrl(result.path));
 					setCurrentProjectPath(null);
 					setLastSavedSnapshot(
 						createProjectSnapshot({ screenVideoPath: sourcePath }, INITIAL_EDITOR_STATE),
@@ -1911,8 +1913,11 @@ export default function VideoEditor() {
 											onBlurDataChange={handleBlurDataPreviewChange}
 											onBlurDataCommit={commitState}
 											cursorTelemetry={cursorTelemetry}
-											cursorHighlight={effectiveCursorHighlight}
-											cursorClickTimestamps={cursorClickTimestamps}
+											showCursor={showCursor}
+											cursorSize={cursorSize}
+											cursorSmoothing={cursorSmoothing}
+											cursorMotionBlur={cursorMotionBlur}
+											cursorClickBounce={cursorClickBounce}
 										/>
 									</div>
 								</div>
@@ -2100,6 +2105,17 @@ export default function VideoEditor() {
 						onSpeedDelete={handleSpeedDelete}
 						unsavedExport={unsavedExport}
 						onSaveUnsavedExport={handleSaveUnsavedExport}
+						showCursor={showCursor}
+						onShowCursorChange={setShowCursor}
+						cursorSize={cursorSize}
+						onCursorSizeChange={setCursorSize}
+						cursorSmoothing={cursorSmoothing}
+						onCursorSmoothingChange={setCursorSmoothing}
+						cursorMotionBlur={cursorMotionBlur}
+						onCursorMotionBlurChange={setCursorMotionBlur}
+						cursorClickBounce={cursorClickBounce}
+						onCursorClickBounceChange={setCursorClickBounce}
+						hasCursorData={cursorTelemetry.length > 0}
 					/>
 				</div>
 			</div>
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index ee52bd9f6..9eb44cec8 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -36,7 +36,12 @@ import { AnnotationOverlay } from "./AnnotationOverlay";
 import {
 	type AnnotationRegion,
 	type BlurData,
+	type CursorTelemetryPoint,
 	computeRotation3DContainScale,
+	DEFAULT_CURSOR_CLICK_BOUNCE,
+	DEFAULT_CURSOR_MOTION_BLUR,
+	DEFAULT_CURSOR_SIZE,
+	DEFAULT_CURSOR_SMOOTHING,
 	DEFAULT_ROTATION_3D,
 	isRotation3DIdentity,
 	lerpRotation3D,
@@ -67,6 +72,11 @@ import {
 	DEFAULT_CURSOR_HIGHLIGHT,
 	drawCursorHighlightGraphics,
 } from "./videoPlayback/cursorHighlight";
+import {
+	DEFAULT_CURSOR_CONFIG,
+	PixiCursorOverlay,
+	preloadCursorAssets,
+} from "./videoPlayback/cursorRenderer";
 import { clampFocusToStage as clampFocusToStageUtil } from "./videoPlayback/focusUtils";
 import { layoutVideoContent as layoutVideoContentUtil } from "./videoPlayback/layoutUtils";
 import { clamp01 } from "./videoPlayback/mathUtils";
@@ -124,9 +134,14 @@ interface VideoPlaybackProps {
 	onBlurSizeChange?: (id: string, size: { width: number; height: number }) => void;
 	onBlurDataChange?: (id: string, blurData: BlurData) => void;
 	onBlurDataCommit?: () => void;
-	cursorTelemetry?: import("./types").CursorTelemetryPoint[];
+	cursorTelemetry?: CursorTelemetryPoint[];
 	cursorHighlight?: CursorHighlightConfig;
 	cursorClickTimestamps?: number[];
+	showCursor?: boolean;
+	cursorSize?: number;
+	cursorSmoothing?: number;
+	cursorMotionBlur?: number;
+	cursorClickBounce?: number;
 }
 
 export interface VideoPlaybackRef {
@@ -187,6 +202,11 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			cursorTelemetry = [],
 			cursorHighlight = DEFAULT_CURSOR_HIGHLIGHT,
 			cursorClickTimestamps = [],
+			showCursor = false,
+			cursorSize = DEFAULT_CURSOR_SIZE,
+			cursorSmoothing = DEFAULT_CURSOR_SMOOTHING,
+			cursorMotionBlur = DEFAULT_CURSOR_MOTION_BLUR,
+			cursorClickBounce = DEFAULT_CURSOR_CLICK_BOUNCE,
 		},
 		ref,
 	) => {
@@ -197,6 +217,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const videoSpriteRef = useRef<Sprite | null>(null);
 		const videoContainerRef = useRef<Container | null>(null);
 		const cameraContainerRef = useRef<Container | null>(null);
+		const cursorContainerRef = useRef<Container | null>(null);
 		const timeUpdateAnimationRef = useRef<number | null>(null);
 		const [pixiReady, setPixiReady] = useState(false);
 		const [videoReady, setVideoReady] = useState(false);
@@ -211,7 +232,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const [webcamDimensions, setWebcamDimensions] = useState<Size | null>(null);
 		const currentTimeRef = useRef(0);
 		const zoomRegionsRef = useRef<ZoomRegion[]>([]);
-		const cursorTelemetryRef = useRef<import("./types").CursorTelemetryPoint[]>([]);
+		const cursorTelemetryRef = useRef<CursorTelemetryPoint[]>([]);
 		const cursorHighlightRef = useRef<CursorHighlightConfig>(DEFAULT_CURSOR_HIGHLIGHT);
 		const cursorClickTimestampsRef = useRef<number[]>([]);
 		const cursorHighlightGraphicsRef = useRef<Graphics | null>(null);
@@ -251,6 +272,12 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const trimRegionsRef = useRef<TrimRegion[]>([]);
 		const speedRegionsRef = useRef<SpeedRegion[]>([]);
 		const motionBlurAmountRef = useRef(motionBlurAmount);
+		const cursorOverlayRef = useRef<PixiCursorOverlay | null>(null);
+		const showCursorRef = useRef(showCursor);
+		const cursorSizeRef = useRef(cursorSize);
+		const cursorSmoothingRef = useRef(cursorSmoothing);
+		const cursorMotionBlurRef = useRef(cursorMotionBlur);
+		const cursorClickBounceRef = useRef(cursorClickBounce);
 		const motionBlurStateRef = useRef<MotionBlurState>(createMotionBlurState());
 		const onTimeUpdateRef = useRef(onTimeUpdate);
 		const onPlayStateChangeRef = useRef(onPlayStateChange);
@@ -573,6 +600,41 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			motionBlurAmountRef.current = motionBlurAmount;
 		}, [motionBlurAmount]);
 
+		useEffect(() => {
+			cursorTelemetryRef.current = cursorTelemetry;
+		}, [cursorTelemetry]);
+
+		useEffect(() => {
+			showCursorRef.current = showCursor;
+		}, [showCursor]);
+
+		useEffect(() => {
+			cursorSizeRef.current = cursorSize;
+		}, [cursorSize]);
+
+		useEffect(() => {
+			cursorSmoothingRef.current = cursorSmoothing;
+		}, [cursorSmoothing]);
+
+		useEffect(() => {
+			cursorMotionBlurRef.current = cursorMotionBlur;
+		}, [cursorMotionBlur]);
+
+		useEffect(() => {
+			cursorClickBounceRef.current = cursorClickBounce;
+		}, [cursorClickBounce]);
+
+		// Sync cursor overlay config when settings change
+		useEffect(() => {
+			const overlay = cursorOverlayRef.current;
+			if (!overlay) return;
+			overlay.setDotRadius(DEFAULT_CURSOR_CONFIG.dotRadius * cursorSize);
+			overlay.setSmoothingFactor(cursorSmoothing);
+			overlay.setMotionBlur(cursorMotionBlur);
+			overlay.setClickBounce(cursorClickBounce);
+			overlay.reset();
+		}, [cursorSize, cursorSmoothing, cursorMotionBlur, cursorClickBounce]);
+
 		useEffect(() => {
 			onTimeUpdateRef.current = onTimeUpdate;
 		}, [onTimeUpdate]);
@@ -692,6 +754,13 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			let app: Application | null = null;
 
 			(async () => {
+				let cursorOverlayEnabled = true;
+				try {
+					await preloadCursorAssets();
+				} catch {
+					cursorOverlayEnabled = false;
+				}
+
 				app = new Application();
 
 				await app.init({
@@ -727,12 +796,33 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				videoContainerRef.current = videoContainer;
 				cameraContainer.addChild(videoContainer);
 
+				// Cursor container - rendered above video
+				const cursorContainer = new Container();
+				cursorContainerRef.current = cursorContainer;
+				cameraContainer.addChild(cursorContainer);
+
+				// Cursor overlay - rendered above the masked video
+				if (cursorOverlayEnabled) {
+					const cursorOverlay = new PixiCursorOverlay({
+						dotRadius: DEFAULT_CURSOR_CONFIG.dotRadius * cursorSizeRef.current,
+						smoothingFactor: cursorSmoothingRef.current,
+						motionBlur: cursorMotionBlurRef.current,
+						clickBounce: cursorClickBounceRef.current,
+					});
+					cursorOverlayRef.current = cursorOverlay;
+					cursorContainer.addChild(cursorOverlay.container);
+				}
+
 				setPixiReady(true);
 			})();
 
 			return () => {
 				mounted = false;
 				setPixiReady(false);
+				if (cursorOverlayRef.current) {
+					cursorOverlayRef.current.destroy();
+					cursorOverlayRef.current = null;
+				}
 				if (app && app.renderer) {
 					app.destroy(true, {
 						children: true,
@@ -743,6 +833,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				appRef.current = null;
 				cameraContainerRef.current = null;
 				videoContainerRef.current = null;
+				cursorContainerRef.current = null;
 				videoSpriteRef.current = null;
 			};
 		}, []);
@@ -772,8 +863,9 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			const video = videoRef.current;
 			const app = appRef.current;
 			const videoContainer = videoContainerRef.current;
+			const cursorContainer = cursorContainerRef.current;
 
-			if (!video || !app || !videoContainer) return;
+			if (!video || !app || !videoContainer || !cursorContainer) return;
 			if (video.videoWidth === 0 || video.videoHeight === 0) return;
 
 			const source = VideoSource.from(video);
@@ -793,6 +885,9 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			videoContainer.addChild(maskGraphics);
 			videoContainer.mask = maskGraphics;
 			maskGraphicsRef.current = maskGraphics;
+			if (cursorOverlayRef.current) {
+				cursorContainer.addChild(cursorOverlayRef.current.container);
+			}
 
 			const cursorHighlightGraphics = new Graphics();
 			cursorHighlightGraphics.visible = false;
@@ -1139,6 +1234,19 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					}
 				}
 
+				// Update cursor overlay
+				const cursorOverlay = cursorOverlayRef.current;
+				if (cursorOverlay) {
+					const timeMs = currentTimeRef.current;
+					cursorOverlay.update(
+						cursorTelemetryRef.current,
+						timeMs,
+						baseMaskRef.current,
+						showCursorRef.current,
+						!isPlayingRef.current || isSeekingRef.current,
+					);
+				}
+
 				const composite3D = composite3DRef.current;
 				const outerWrapper = outerWrapperRef.current;
 				if (composite3D && outerWrapper) {
diff --git a/src/components/video-editor/projectPersistence.ts b/src/components/video-editor/projectPersistence.ts
index 8d134282d..16fc09073 100644
--- a/src/components/video-editor/projectPersistence.ts
+++ b/src/components/video-editor/projectPersistence.ts
@@ -118,50 +118,21 @@ function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
-function isFileUrl(value: string): boolean {
-	return /^file:\/\//i.test(value);
-}
-
-function encodePathSegments(pathname: string, keepWindowsDrive = false): string {
-	return pathname
-		.split("/")
-		.map((segment, index) => {
-			if (!segment) return "";
-			if (keepWindowsDrive && index === 1 && /^[a-zA-Z]:$/.test(segment)) {
-				return segment;
-			}
-			return encodeURIComponent(segment);
-		})
-		.join("/");
-}
-
 export function toFileUrl(filePath: string): string {
 	const normalized = filePath.replace(/\\/g, "/");
-
-	// Windows drive path: C:/Users/...
-	if (/^[a-zA-Z]:\//.test(normalized)) {
-		return `file://${encodePathSegments(`/${normalized}`, true)}`;
+	if (normalized.match(/^[a-zA-Z]:/)) {
+		return `file:///${encodeURI(normalized)}`;
 	}
-
-	// UNC path: //server/share/...
-	if (normalized.startsWith("//")) {
-		const [host, ...pathParts] = normalized.replace(/^\/+/, "").split("/");
-		const encodedPath = pathParts.map((part) => encodeURIComponent(part)).join("/");
-		return encodedPath ? `file://${host}/${encodedPath}` : `file://${host}/`;
-	}
-
-	const absolutePath = normalized.startsWith("/") ? normalized : `/${normalized}`;
-	return `file://${encodePathSegments(absolutePath)}`;
+	return `file://${encodeURI(normalized)}`;
 }
 
 export function fromFileUrl(fileUrl: string): string {
-	const value = fileUrl.trim();
-	if (!isFileUrl(value)) {
+	if (!fileUrl.startsWith("file://")) {
 		return fileUrl;
 	}
 
 	try {
-		const url = new URL(value);
+		const url = new URL(fileUrl);
 		const pathname = decodeURIComponent(url.pathname);
 
 		if (url.host && url.host !== "localhost") {
@@ -174,13 +145,7 @@ export function fromFileUrl(fileUrl: string): string {
 
 		return pathname;
 	} catch {
-		const rawFallbackPath = value.replace(/^file:\/\//i, "");
-		let fallbackPath = rawFallbackPath;
-		try {
-			fallbackPath = decodeURIComponent(rawFallbackPath);
-		} catch {
-			// Keep raw best-effort path if percent decoding fails.
-		}
+		const fallbackPath = decodeURIComponent(fileUrl.replace(/^file:\/\//, ""));
 		return fallbackPath.replace(/^\/([a-zA-Z]:)/, "$1");
 	}
 }
diff --git a/src/components/video-editor/types.ts b/src/components/video-editor/types.ts
index f976efc8c..3785eae3b 100644
--- a/src/components/video-editor/types.ts
+++ b/src/components/video-editor/types.ts
@@ -168,8 +168,32 @@ export interface CursorTelemetryPoint {
 	timeMs: number;
 	cx: number;
 	cy: number;
+	interactionType?: "move" | "click" | "double-click" | "right-click" | "middle-click" | "mouseup";
+	cursorType?:
+		| "arrow"
+		| "text"
+		| "pointer"
+		| "crosshair"
+		| "open-hand"
+		| "closed-hand"
+		| "resize-ew"
+		| "resize-ns"
+		| "not-allowed";
 }
 
+export interface CursorVisualSettings {
+	size: number;
+	smoothing: number;
+	motionBlur: number;
+	clickBounce: number;
+}
+
+export const DEFAULT_CURSOR_SIZE = 3.0;
+export const DEFAULT_CURSOR_SMOOTHING = 0.67;
+export const DEFAULT_CURSOR_MOTION_BLUR = 0.35;
+export const DEFAULT_CURSOR_CLICK_BOUNCE = 2.5;
+export const DEFAULT_ZOOM_MOTION_BLUR = 0.35;
+
 export interface TrimRegion {
 	id: string;
 	startMs: number;
diff --git a/src/components/video-editor/videoPlayback/cursorRenderer.ts b/src/components/video-editor/videoPlayback/cursorRenderer.ts
new file mode 100644
index 000000000..7b912c541
--- /dev/null
+++ b/src/components/video-editor/videoPlayback/cursorRenderer.ts
@@ -0,0 +1,766 @@
+import { Assets, BlurFilter, Container, Graphics, Sprite, Texture } from "pixi.js";
+import { MotionBlurFilter } from "pixi-filters/motion-blur";
+import type { CursorTelemetryPoint } from "../types";
+import {
+	createSpringState,
+	getCursorSpringConfig,
+	resetSpringState,
+	stepSpringValue,
+} from "./motionSmoothing";
+import { UPLOADED_CURSOR_SAMPLE_SIZE, uploadedCursorAssets } from "./uploadedCursorAssets";
+
+type CursorAssetKey = NonNullable<CursorTelemetryPoint["cursorType"]>;
+
+/** System cursor asset from native helper (macOS only). */
+type SystemCursorAsset = {
+	dataUrl: string;
+	width: number;
+	height: number;
+	hotspotX: number;
+	hotspotY: number;
+};
+
+type LoadedCursorAsset = {
+	texture: Texture;
+	image: HTMLImageElement;
+	aspectRatio: number;
+	anchorX: number;
+	anchorY: number;
+};
+
+export interface CursorViewportRect {
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+}
+
+/**
+ * Configuration for cursor rendering.
+ */
+export interface CursorRenderConfig {
+	/** Base cursor height in pixels (at reference width of 1920px) */
+	dotRadius: number;
+	/** Cursor fill color (hex number for PixiJS) */
+	dotColor: number;
+	/** Cursor opacity (0–1) */
+	dotAlpha: number;
+	/** Unused, kept for interface compatibility */
+	trailLength: number;
+	/** Smoothing factor for cursor interpolation (0–1, lower = smoother/slower) */
+	smoothingFactor: number;
+	/** Directional cursor motion blur amount. */
+	motionBlur: number;
+	/** Click bounce multiplier. */
+	clickBounce: number;
+}
+
+export const DEFAULT_CURSOR_CONFIG: CursorRenderConfig = {
+	dotRadius: 28,
+	dotColor: 0xffffff,
+	dotAlpha: 0.95,
+	trailLength: 0,
+	smoothingFactor: 0.18,
+	motionBlur: 0,
+	clickBounce: 1,
+};
+
+const REFERENCE_WIDTH = 1920;
+const MIN_CURSOR_VIEWPORT_SCALE = 0.55;
+const CLICK_ANIMATION_MS = 140;
+const CLICK_RING_FADE_MS = 240;
+const CURSOR_MOTION_BLUR_BASE_MULTIPLIER = 0.08;
+const CURSOR_TIME_DISCONTINUITY_MS = 100;
+const CURSOR_SVG_DROP_SHADOW_FILTER = "drop-shadow(0px 2px 3px rgba(0, 0, 0, 0.35))";
+const CURSOR_SHADOW_COLOR = 0x000000;
+const CURSOR_SHADOW_ALPHA = 0.35;
+const CURSOR_SHADOW_OFFSET_X = 0;
+const CURSOR_SHADOW_OFFSET_Y = 2;
+const CURSOR_SHADOW_BLUR = 3;
+const CURSOR_SHADOW_PADDING = 12;
+
+let cursorAssetsPromise: Promise<void> | null = null;
+let loadedCursorAssets: Partial<Record<CursorAssetKey, LoadedCursorAsset>> = {};
+const SUPPORTED_CURSOR_KEYS: CursorAssetKey[] = [
+	"arrow",
+	"text",
+	"pointer",
+	"crosshair",
+	"open-hand",
+	"closed-hand",
+	"resize-ew",
+	"resize-ns",
+	"not-allowed",
+];
+
+function loadImage(dataUrl: string) {
+	return new Promise<HTMLImageElement>((resolve, reject) => {
+		const image = new Image();
+		image.onload = () => resolve(image);
+		image.onerror = () =>
+			reject(new Error(`Failed to load cursor image: ${dataUrl.slice(0, 128)}`));
+		image.src = dataUrl;
+	});
+}
+
+function clamp(value: number, min: number, max: number) {
+	return Math.min(max, Math.max(min, value));
+}
+
+function getNormalizedAnchor(
+	systemAsset: SystemCursorAsset | undefined,
+	fallbackAnchor: { x: number; y: number },
+) {
+	if (!systemAsset || systemAsset.width <= 0 || systemAsset.height <= 0) {
+		return fallbackAnchor;
+	}
+
+	return {
+		x: clamp(systemAsset.hotspotX / systemAsset.width, 0, 1),
+		y: clamp(systemAsset.hotspotY / systemAsset.height, 0, 1),
+	};
+}
+
+/**
+ * Loads an SVG at `sampleSize × sampleSize`, crops the trim region out of it,
+ * and returns a PNG data-URL of the cropped result. This is required because
+ * SVG files have their own natural pixel size (e.g. 32×32) which does not
+ * match the 1024-sample coordinate space used by the trim measurements.
+ */
+async function rasterizeAndCropSvg(
+	url: string,
+	sampleSize: number,
+	trimX: number,
+	trimY: number,
+	trimWidth: number,
+	trimHeight: number,
+): Promise<{ dataUrl: string; width: number; height: number }> {
+	const img = await loadImage(url);
+
+	// Draw at full sample size
+	const srcCanvas = document.createElement("canvas");
+	srcCanvas.width = sampleSize;
+	srcCanvas.height = sampleSize;
+	const srcCtx = srcCanvas.getContext("2d")!;
+	srcCtx.drawImage(img, 0, 0, sampleSize, sampleSize);
+
+	// Crop to trim bounds
+	const dstCanvas = document.createElement("canvas");
+	dstCanvas.width = trimWidth;
+	dstCanvas.height = trimHeight;
+	const dstCtx = dstCanvas.getContext("2d")!;
+	dstCtx.drawImage(srcCanvas, trimX, trimY, trimWidth, trimHeight, 0, 0, trimWidth, trimHeight);
+
+	return {
+		dataUrl: dstCanvas.toDataURL("image/png"),
+		width: dstCanvas.width,
+		height: dstCanvas.height,
+	};
+}
+
+function getCursorAsset(key: CursorAssetKey): LoadedCursorAsset {
+	const asset = loadedCursorAssets[key];
+	if (!asset) {
+		throw new Error(`Missing cursor asset for ${key}`);
+	}
+
+	return asset;
+}
+
+function getAvailableCursorKeys(): CursorAssetKey[] {
+	const loadedKeys = Object.keys(loadedCursorAssets) as CursorAssetKey[];
+	return loadedKeys.length > 0 ? loadedKeys : ["arrow"];
+}
+
+export async function preloadCursorAssets() {
+	if (!cursorAssetsPromise) {
+		cursorAssetsPromise = (async () => {
+			let systemCursors: Record<string, SystemCursorAsset> = {};
+
+			try {
+				const api = window.electronAPI as Record<string, unknown>;
+				if (typeof api.getSystemCursorAssets === "function") {
+					const result = await (
+						api.getSystemCursorAssets as () => Promise<{
+							success: boolean;
+							cursors?: Record<string, SystemCursorAsset>;
+						}>
+					)();
+					if (result.success && result.cursors) {
+						systemCursors = result.cursors;
+					}
+				}
+			} catch (error) {
+				console.warn("[CursorRenderer] Failed to fetch system cursor assets:", error);
+			}
+
+			const entries = await Promise.all(
+				SUPPORTED_CURSOR_KEYS.map(async (key) => {
+					const systemAsset = systemCursors[key];
+					const uploadedAsset = uploadedCursorAssets[key];
+					const assetUrl = uploadedAsset?.url ?? systemAsset?.dataUrl;
+
+					if (!assetUrl) {
+						console.warn(`[CursorRenderer] No cursor image for: ${key}`);
+						return null;
+					}
+
+					try {
+						let finalUrl: string;
+						let width: number;
+						let height: number;
+						let normalizedAnchor: { x: number; y: number };
+
+						if (uploadedAsset) {
+							const { trim, fallbackAnchor } = uploadedAsset;
+							const rasterized = await rasterizeAndCropSvg(
+								assetUrl,
+								UPLOADED_CURSOR_SAMPLE_SIZE,
+								trim.x,
+								trim.y,
+								trim.width,
+								trim.height,
+							);
+							finalUrl = rasterized.dataUrl;
+							width = rasterized.width;
+							height = rasterized.height;
+							normalizedAnchor = {
+								x: clamp((fallbackAnchor.x * trim.width) / width, 0, 1),
+								y: clamp((fallbackAnchor.y * trim.height) / height, 0, 1),
+							};
+						} else {
+							finalUrl = assetUrl;
+							const img = await loadImage(finalUrl);
+							width = img.naturalWidth;
+							height = img.naturalHeight;
+							normalizedAnchor = getNormalizedAnchor(systemAsset, { x: 0, y: 0 });
+						}
+
+						await Assets.load(finalUrl);
+						const image = await loadImage(finalUrl);
+						const texture = Texture.from(finalUrl);
+
+						return [
+							key,
+							{
+								texture,
+								image,
+								aspectRatio: height > 0 ? width / height : 1,
+								anchorX: normalizedAnchor.x,
+								anchorY: normalizedAnchor.y,
+							} satisfies LoadedCursorAsset,
+						] as const;
+					} catch (error) {
+						console.warn(`[CursorRenderer] Failed to load cursor image for: ${key}`, error);
+						return null;
+					}
+				}),
+			);
+
+			loadedCursorAssets = Object.fromEntries(
+				entries.filter(Boolean).map((entry) => entry!),
+			) as Partial<Record<CursorAssetKey, LoadedCursorAsset>>;
+
+			if (!loadedCursorAssets.arrow) {
+				throw new Error("Failed to initialize the fallback arrow cursor asset");
+			}
+		})();
+	}
+
+	return cursorAssetsPromise;
+}
+
+/**
+ * Interpolates cursor position from telemetry samples at a given time.
+ * Uses linear interpolation between the two nearest samples.
+ */
+export function interpolateCursorPosition(
+	samples: CursorTelemetryPoint[],
+	timeMs: number,
+): { cx: number; cy: number } | null {
+	if (!samples || samples.length === 0) return null;
+
+	if (timeMs <= samples[0].timeMs) {
+		return { cx: samples[0].cx, cy: samples[0].cy };
+	}
+
+	if (timeMs >= samples[samples.length - 1].timeMs) {
+		return { cx: samples[samples.length - 1].cx, cy: samples[samples.length - 1].cy };
+	}
+
+	let lo = 0;
+	let hi = samples.length - 1;
+	while (lo < hi - 1) {
+		const mid = (lo + hi) >> 1;
+		if (samples[mid].timeMs <= timeMs) {
+			lo = mid;
+		} else {
+			hi = mid;
+		}
+	}
+
+	const a = samples[lo];
+	const b = samples[hi];
+	const span = b.timeMs - a.timeMs;
+	if (span <= 0) return { cx: a.cx, cy: a.cy };
+
+	const t = (timeMs - a.timeMs) / span;
+	return {
+		cx: a.cx + (b.cx - a.cx) * t,
+		cy: a.cy + (b.cy - a.cy) * t,
+	};
+}
+
+function findLatestSample(samples: CursorTelemetryPoint[], timeMs: number) {
+	if (samples.length === 0) return null;
+
+	let lo = 0;
+	let hi = samples.length - 1;
+	while (lo < hi) {
+		const mid = Math.ceil((lo + hi) / 2);
+		if (samples[mid].timeMs <= timeMs) {
+			lo = mid;
+		} else {
+			hi = mid - 1;
+		}
+	}
+
+	return samples[lo]?.timeMs <= timeMs ? samples[lo] : null;
+}
+
+function findLatestInteractionSample(samples: CursorTelemetryPoint[], timeMs: number) {
+	for (let index = samples.length - 1; index >= 0; index -= 1) {
+		const sample = samples[index];
+		if (sample.timeMs > timeMs) {
+			continue;
+		}
+
+		if (
+			sample.interactionType === "click" ||
+			sample.interactionType === "double-click" ||
+			sample.interactionType === "right-click" ||
+			sample.interactionType === "middle-click"
+		) {
+			return sample;
+		}
+	}
+
+	return null;
+}
+
+function findLatestStableCursorType(samples: CursorTelemetryPoint[], timeMs: number) {
+	// Binary search to find position at timeMs, then scan backwards
+	let lo = 0;
+	let hi = samples.length - 1;
+	while (lo < hi) {
+		const mid = Math.ceil((lo + hi) / 2);
+		if (samples[mid].timeMs <= timeMs) {
+			lo = mid;
+		} else {
+			hi = mid - 1;
+		}
+	}
+
+	// Scan backwards from the position to find a sample with cursorType
+	// Skip click events only (not mouseup) to avoid transient re-type during clicks
+	for (let index = lo; index >= 0; index -= 1) {
+		const sample = samples[index];
+		if (sample.timeMs > timeMs) {
+			continue;
+		}
+
+		if (!sample.cursorType) {
+			continue;
+		}
+
+		if (
+			sample.interactionType === "click" ||
+			sample.interactionType === "double-click" ||
+			sample.interactionType === "right-click" ||
+			sample.interactionType === "middle-click"
+		) {
+			continue;
+		}
+
+		return sample.cursorType;
+	}
+
+	return findLatestSample(samples, timeMs)?.cursorType ?? "arrow";
+}
+
+function getCursorViewportScale(viewport: CursorViewportRect) {
+	return Math.max(MIN_CURSOR_VIEWPORT_SCALE, viewport.width / REFERENCE_WIDTH);
+}
+
+function getCursorVisualState(samples: CursorTelemetryPoint[], timeMs: number) {
+	const latestClick = findLatestInteractionSample(samples, timeMs);
+	const interactionType = latestClick?.interactionType;
+	const ageMs = latestClick ? Math.max(0, timeMs - latestClick.timeMs) : Number.POSITIVE_INFINITY;
+	const isClickEvent =
+		interactionType === "click" ||
+		interactionType === "double-click" ||
+		interactionType === "right-click" ||
+		interactionType === "middle-click";
+	const clickBounceProgress =
+		latestClick && isClickEvent && ageMs <= CLICK_ANIMATION_MS ? 1 - ageMs / CLICK_ANIMATION_MS : 0;
+
+	return {
+		cursorType: findLatestStableCursorType(samples, timeMs),
+		clickBounceProgress,
+		clickProgress:
+			latestClick && isClickEvent && ageMs <= CLICK_RING_FADE_MS
+				? 1 - ageMs / CLICK_RING_FADE_MS
+				: 0,
+	};
+}
+
+/**
+ * Manages a smoothed cursor state that chases the interpolated target.
+ */
+export class SmoothedCursorState {
+	public x = 0.5;
+	public y = 0.5;
+	public trail: Array<{ x: number; y: number }> = [];
+	private smoothingFactor: number;
+	private trailLength: number;
+	private initialized = false;
+	private lastTimeMs: number | null = null;
+	private xSpring = createSpringState(0.5);
+	private ySpring = createSpringState(0.5);
+
+	constructor(config: Pick<CursorRenderConfig, "smoothingFactor" | "trailLength">) {
+		this.smoothingFactor = config.smoothingFactor;
+		this.trailLength = config.trailLength;
+	}
+
+	update(targetX: number, targetY: number, timeMs: number): void {
+		if (!this.initialized) {
+			this.x = targetX;
+			this.y = targetY;
+			this.initialized = true;
+			this.lastTimeMs = timeMs;
+			this.xSpring.value = targetX;
+			this.ySpring.value = targetY;
+			this.xSpring.velocity = 0;
+			this.ySpring.velocity = 0;
+			this.xSpring.initialized = true;
+			this.ySpring.initialized = true;
+			this.trail = [];
+			return;
+		}
+
+		if (this.smoothingFactor <= 0 || (this.lastTimeMs !== null && timeMs < this.lastTimeMs)) {
+			this.snapTo(targetX, targetY, timeMs);
+			return;
+		}
+
+		this.trail.unshift({ x: this.x, y: this.y });
+		if (this.trail.length > this.trailLength) {
+			this.trail.length = this.trailLength;
+		}
+
+		const deltaMs = this.lastTimeMs === null ? 1000 / 60 : Math.max(1, timeMs - this.lastTimeMs);
+		this.lastTimeMs = timeMs;
+
+		const springConfig = getCursorSpringConfig(this.smoothingFactor);
+		this.x = stepSpringValue(this.xSpring, targetX, deltaMs, springConfig);
+		this.y = stepSpringValue(this.ySpring, targetY, deltaMs, springConfig);
+	}
+
+	setSmoothingFactor(smoothingFactor: number): void {
+		this.smoothingFactor = smoothingFactor;
+	}
+
+	snapTo(targetX: number, targetY: number, timeMs: number): void {
+		this.x = targetX;
+		this.y = targetY;
+		this.initialized = true;
+		this.lastTimeMs = timeMs;
+		this.xSpring.value = targetX;
+		this.ySpring.value = targetY;
+		this.xSpring.velocity = 0;
+		this.ySpring.velocity = 0;
+		this.xSpring.initialized = true;
+		this.ySpring.initialized = true;
+		this.trail = [];
+	}
+
+	reset(): void {
+		this.initialized = false;
+		this.lastTimeMs = null;
+		this.trail = [];
+		resetSpringState(this.xSpring, this.x);
+		resetSpringState(this.ySpring, this.y);
+	}
+}
+
+function drawClickRing(graphics: Graphics, px: number, py: number, h: number, progress: number) {
+	void graphics;
+	void px;
+	void py;
+	void h;
+	void progress;
+}
+
+export class PixiCursorOverlay {
+	public readonly container: Container;
+	private clickRingGraphics: Graphics;
+	private cursorShadowSprites: Partial<Record<CursorAssetKey, Sprite>>;
+	private cursorShadowFilters: Partial<Record<CursorAssetKey, BlurFilter>>;
+	private cursorSprites: Partial<Record<CursorAssetKey, Sprite>>;
+	private cursorMotionBlurFilter: MotionBlurFilter;
+	private state: SmoothedCursorState;
+	private config: CursorRenderConfig;
+	private lastRenderedPoint: { px: number; py: number } | null = null;
+	private lastRenderedTimeMs: number | null = null;
+
+	constructor(config: Partial<CursorRenderConfig> = {}) {
+		this.config = { ...DEFAULT_CURSOR_CONFIG, ...config };
+		this.state = new SmoothedCursorState(this.config);
+
+		this.container = new Container();
+		this.container.label = "cursor-overlay";
+
+		this.clickRingGraphics = new Graphics();
+		this.cursorShadowSprites = {};
+		this.cursorShadowFilters = {};
+		this.cursorSprites = {};
+		for (const key of getAvailableCursorKeys()) {
+			const asset = getCursorAsset(key);
+			const shadowSprite = new Sprite(asset.texture);
+			shadowSprite.anchor.set(asset.anchorX, asset.anchorY);
+			shadowSprite.visible = false;
+			shadowSprite.tint = CURSOR_SHADOW_COLOR;
+			shadowSprite.alpha = CURSOR_SHADOW_ALPHA;
+			const shadowFilter = new BlurFilter();
+			shadowFilter.blur = CURSOR_SHADOW_BLUR;
+			shadowFilter.quality = 4;
+			shadowFilter.padding = CURSOR_SHADOW_PADDING;
+			shadowSprite.filters = [shadowFilter];
+			this.cursorShadowSprites[key] = shadowSprite;
+			this.cursorShadowFilters[key] = shadowFilter;
+
+			const sprite = new Sprite(asset.texture);
+			sprite.anchor.set(asset.anchorX, asset.anchorY);
+			sprite.visible = false;
+			this.cursorSprites[key] = sprite;
+		}
+
+		this.cursorMotionBlurFilter = new MotionBlurFilter([0, 0], 5, 0);
+		this.container.filters = null;
+
+		this.container.addChild(
+			this.clickRingGraphics,
+			...Object.values(this.cursorShadowSprites),
+			...Object.values(this.cursorSprites),
+		);
+		this.setMotionBlur(this.config.motionBlur);
+	}
+
+	setDotRadius(dotRadius: number) {
+		this.config.dotRadius = dotRadius;
+	}
+
+	setSmoothingFactor(smoothingFactor: number) {
+		this.config.smoothingFactor = smoothingFactor;
+		this.state.setSmoothingFactor(smoothingFactor);
+	}
+
+	setMotionBlur(motionBlur: number) {
+		this.config.motionBlur = Math.max(0, motionBlur);
+		this.container.filters = this.config.motionBlur > 0 ? [this.cursorMotionBlurFilter] : null;
+		if (this.config.motionBlur <= 0) {
+			this.cursorMotionBlurFilter.velocity = { x: 0, y: 0 };
+			this.cursorMotionBlurFilter.kernelSize = 5;
+			this.cursorMotionBlurFilter.offset = 0;
+		}
+	}
+
+	setClickBounce(clickBounce: number) {
+		this.config.clickBounce = Math.max(0, clickBounce);
+	}
+
+	update(
+		samples: CursorTelemetryPoint[],
+		timeMs: number,
+		viewport: CursorViewportRect,
+		visible: boolean,
+		freeze = false,
+	): void {
+		if (!visible || samples.length === 0 || viewport.width <= 0 || viewport.height <= 0) {
+			this.container.visible = false;
+			this.lastRenderedPoint = null;
+			this.lastRenderedTimeMs = null;
+			this.cursorMotionBlurFilter.velocity = { x: 0, y: 0 };
+			return;
+		}
+
+		const target = interpolateCursorPosition(samples, timeMs);
+		if (!target) {
+			this.container.visible = false;
+			return;
+		}
+
+		const sameFrameTime =
+			this.lastRenderedTimeMs !== null && Math.abs(this.lastRenderedTimeMs - timeMs) < 0.0001;
+		const hasTimeDiscontinuity =
+			this.lastRenderedTimeMs !== null &&
+			Math.abs(timeMs - this.lastRenderedTimeMs) > CURSOR_TIME_DISCONTINUITY_MS;
+
+		if (freeze || hasTimeDiscontinuity) {
+			if (!sameFrameTime || !this.lastRenderedPoint) {
+				this.state.snapTo(target.cx, target.cy, timeMs);
+			}
+		} else {
+			this.state.update(target.cx, target.cy, timeMs);
+		}
+		this.container.visible = true;
+
+		const px = viewport.x + this.state.x * viewport.width;
+		const py = viewport.y + this.state.y * viewport.height;
+		const h = this.config.dotRadius * getCursorViewportScale(viewport);
+		const { cursorType, clickBounceProgress, clickProgress } = getCursorVisualState(
+			samples,
+			timeMs,
+		);
+		const spriteKey = (cursorType in this.cursorSprites ? cursorType : "arrow") as CursorAssetKey;
+		const asset = getCursorAsset(spriteKey);
+		const shadowSprite = this.cursorShadowSprites[spriteKey] ?? this.cursorShadowSprites.arrow!;
+		const sprite = this.cursorSprites[spriteKey] ?? this.cursorSprites.arrow!;
+		const bounceScale = Math.max(
+			0.72,
+			1 - Math.sin(clickBounceProgress * Math.PI) * (0.08 * this.config.clickBounce),
+		);
+		const scaledH = h;
+
+		this.clickRingGraphics.clear();
+		drawClickRing(this.clickRingGraphics, px, py, h, clickProgress);
+
+		for (const [key, currentShadowSprite] of Object.entries(this.cursorShadowSprites) as Array<
+			[CursorAssetKey, Sprite]
+		>) {
+			currentShadowSprite.visible = key === spriteKey;
+		}
+
+		for (const [key, currentSprite] of Object.entries(this.cursorSprites) as Array<
+			[CursorAssetKey, Sprite]
+		>) {
+			currentSprite.visible = key === spriteKey;
+		}
+
+		if (shadowSprite) {
+			shadowSprite.height = scaledH * bounceScale;
+			shadowSprite.width = scaledH * bounceScale * asset.aspectRatio;
+			shadowSprite.position.set(px + CURSOR_SHADOW_OFFSET_X, py + CURSOR_SHADOW_OFFSET_Y);
+		}
+
+		if (sprite) {
+			sprite.alpha = this.config.dotAlpha;
+			sprite.height = scaledH * bounceScale;
+			sprite.width = scaledH * bounceScale * asset.aspectRatio;
+			sprite.position.set(px, py);
+		}
+
+		this.applyCursorMotionBlur(px, py, timeMs, freeze);
+		this.lastRenderedPoint = { px, py };
+		this.lastRenderedTimeMs = timeMs;
+	}
+
+	private applyCursorMotionBlur(px: number, py: number, timeMs: number, freeze: boolean) {
+		if (
+			freeze ||
+			this.config.motionBlur <= 0 ||
+			!this.lastRenderedPoint ||
+			this.lastRenderedTimeMs === null
+		) {
+			this.cursorMotionBlurFilter.velocity = { x: 0, y: 0 };
+			this.cursorMotionBlurFilter.kernelSize = 5;
+			this.cursorMotionBlurFilter.offset = 0;
+			return;
+		}
+
+		const deltaMs = Math.max(1, timeMs - this.lastRenderedTimeMs);
+		const dx = px - this.lastRenderedPoint.px;
+		const dy = py - this.lastRenderedPoint.py;
+		const velocityScale =
+			(1000 / deltaMs) * this.config.motionBlur * CURSOR_MOTION_BLUR_BASE_MULTIPLIER;
+		const velocity = {
+			x: dx * velocityScale,
+			y: dy * velocityScale,
+		};
+		const magnitude = Math.hypot(velocity.x, velocity.y);
+
+		this.cursorMotionBlurFilter.velocity = magnitude > 0.05 ? velocity : { x: 0, y: 0 };
+		this.cursorMotionBlurFilter.kernelSize = magnitude > 3 ? 9 : magnitude > 1 ? 7 : 5;
+		this.cursorMotionBlurFilter.offset = magnitude > 0.5 ? -0.25 : 0;
+	}
+
+	reset(): void {
+		this.state.reset();
+		this.clickRingGraphics.clear();
+		for (const shadowSprite of Object.values(this.cursorShadowSprites)) {
+			shadowSprite.visible = false;
+			shadowSprite.scale.set(1);
+		}
+		for (const sprite of Object.values(this.cursorSprites)) {
+			sprite.visible = false;
+			sprite.scale.set(1);
+		}
+		this.container.visible = false;
+		this.lastRenderedPoint = null;
+		this.lastRenderedTimeMs = null;
+		this.cursorMotionBlurFilter.velocity = { x: 0, y: 0 };
+		this.cursorMotionBlurFilter.kernelSize = 5;
+		this.cursorMotionBlurFilter.offset = 0;
+	}
+
+	destroy(): void {
+		this.clickRingGraphics.destroy();
+		for (const shadowFilter of Object.values(this.cursorShadowFilters)) {
+			shadowFilter.destroy();
+		}
+		this.cursorMotionBlurFilter.destroy();
+		this.container.destroy({ children: true });
+	}
+}
+
+export function drawCursorOnCanvas(
+	ctx: CanvasRenderingContext2D,
+	samples: CursorTelemetryPoint[],
+	timeMs: number,
+	viewport: CursorViewportRect,
+	smoothedState: SmoothedCursorState,
+	config: CursorRenderConfig = DEFAULT_CURSOR_CONFIG,
+): void {
+	if (samples.length === 0 || viewport.width <= 0 || viewport.height <= 0) return;
+
+	const target = interpolateCursorPosition(samples, timeMs);
+	if (!target) return;
+
+	smoothedState.update(target.cx, target.cy, timeMs);
+
+	const px = viewport.x + smoothedState.x * viewport.width;
+	const py = viewport.y + smoothedState.y * viewport.height;
+	const h = config.dotRadius * getCursorViewportScale(viewport);
+	const { cursorType, clickBounceProgress } = getCursorVisualState(samples, timeMs);
+	const spriteKey = (
+		cursorType && loadedCursorAssets[cursorType] ? cursorType : "arrow"
+	) as CursorAssetKey;
+	const asset = getCursorAsset(spriteKey);
+	const bounceScale = Math.max(
+		0.72,
+		1 - Math.sin(clickBounceProgress * Math.PI) * (0.08 * config.clickBounce),
+	);
+
+	ctx.save();
+	ctx.filter = CURSOR_SVG_DROP_SHADOW_FILTER;
+
+	const drawHeight = h * bounceScale;
+	const drawWidth = drawHeight * asset.aspectRatio;
+	const hotspotX = asset.anchorX * drawWidth;
+	const hotspotY = asset.anchorY * drawHeight;
+	ctx.globalAlpha = config.dotAlpha;
+	ctx.drawImage(asset.image, px - hotspotX, py - hotspotY, drawWidth, drawHeight);
+
+	ctx.restore();
+}
diff --git a/src/components/video-editor/videoPlayback/motionSmoothing.ts b/src/components/video-editor/videoPlayback/motionSmoothing.ts
new file mode 100644
index 000000000..e2cec6fd1
--- /dev/null
+++ b/src/components/video-editor/videoPlayback/motionSmoothing.ts
@@ -0,0 +1,149 @@
+import { spring } from "motion";
+
+export interface SpringState {
+	value: number;
+	velocity: number;
+	initialized: boolean;
+}
+
+export interface SpringConfig {
+	stiffness: number;
+	damping: number;
+	mass: number;
+	restDelta?: number;
+	restSpeed?: number;
+}
+
+const CURSOR_SMOOTHING_MIN = 0;
+const CURSOR_SMOOTHING_MAX = 2;
+const CURSOR_SMOOTHING_LEGACY_MAX = 0.5;
+
+export function createSpringState(initialValue = 0): SpringState {
+	return {
+		value: initialValue,
+		velocity: 0,
+		initialized: false,
+	};
+}
+
+export function resetSpringState(state: SpringState, initialValue?: number) {
+	if (typeof initialValue === "number") {
+		state.value = initialValue;
+	}
+
+	state.velocity = 0;
+	state.initialized = false;
+}
+
+export function clampDeltaMs(deltaMs: number, fallbackMs = 1000 / 60) {
+	if (!Number.isFinite(deltaMs) || deltaMs <= 0) {
+		return fallbackMs;
+	}
+
+	return Math.min(80, Math.max(1, deltaMs));
+}
+
+export function stepSpringValue(
+	state: SpringState,
+	target: number,
+	deltaMs: number,
+	config: SpringConfig,
+) {
+	const safeDeltaMs = clampDeltaMs(deltaMs);
+
+	if (!state.initialized || !Number.isFinite(state.value)) {
+		state.value = target;
+		state.velocity = 0;
+		state.initialized = true;
+		return state.value;
+	}
+
+	const restDelta = config.restDelta ?? 0.0005;
+	const restSpeed = config.restSpeed ?? 0.02;
+
+	if (Math.abs(target - state.value) <= restDelta && Math.abs(state.velocity) <= restSpeed) {
+		state.value = target;
+		state.velocity = 0;
+		return state.value;
+	}
+
+	const previousValue = state.value;
+	const generator = spring({
+		keyframes: [state.value, target],
+		velocity: state.velocity,
+		stiffness: config.stiffness,
+		damping: config.damping,
+		mass: config.mass,
+		restDelta,
+		restSpeed,
+	});
+
+	const result = generator.next(safeDeltaMs);
+	state.value = result.done ? target : result.value;
+	state.velocity = ((state.value - previousValue) / safeDeltaMs) * 1000;
+
+	if (result.done) {
+		state.velocity = 0;
+	}
+
+	return state.value;
+}
+
+export function getCursorSpringConfig(smoothingFactor: number): SpringConfig {
+	const clamped = Math.min(CURSOR_SMOOTHING_MAX, Math.max(CURSOR_SMOOTHING_MIN, smoothingFactor));
+
+	if (clamped <= 0) {
+		return {
+			stiffness: 1000,
+			damping: 100,
+			mass: 1,
+			restDelta: 0.0001,
+			restSpeed: 0.001,
+		};
+	}
+
+	if (clamped <= CURSOR_SMOOTHING_LEGACY_MAX) {
+		const legacyNormalized = Math.min(
+			1,
+			Math.max(
+				0,
+				(clamped - CURSOR_SMOOTHING_MIN) / (CURSOR_SMOOTHING_LEGACY_MAX - CURSOR_SMOOTHING_MIN),
+			),
+		);
+
+		return {
+			stiffness: 760 - legacyNormalized * 420,
+			damping: 34 + legacyNormalized * 24,
+			mass: 0.55 + legacyNormalized * 0.45,
+			restDelta: 0.0002,
+			restSpeed: 0.01,
+		};
+	}
+
+	const extendedNormalized = Math.min(
+		1,
+		Math.max(
+			0,
+			(clamped - CURSOR_SMOOTHING_LEGACY_MAX) /
+				(CURSOR_SMOOTHING_MAX - CURSOR_SMOOTHING_LEGACY_MAX),
+		),
+	);
+
+	return {
+		stiffness: 340 - extendedNormalized * 180,
+		damping: 58 + extendedNormalized * 22,
+		mass: 1 + extendedNormalized * 0.35,
+		restDelta: 0.0002,
+		restSpeed: 0.01,
+	};
+}
+
+export function getZoomSpringConfig(): SpringConfig {
+	return {
+		stiffness: 320,
+		damping: 40,
+		mass: 0.92,
+		restDelta: 0.0005,
+		restSpeed: 0.015,
+	};
+}
diff --git a/src/components/video-editor/videoPlayback/uploadedCursorAssets.ts b/src/components/video-editor/videoPlayback/uploadedCursorAssets.ts
new file mode 100644
index 000000000..4a0cd29bc
--- /dev/null
+++ b/src/components/video-editor/videoPlayback/uploadedCursorAssets.ts
@@ -0,0 +1,70 @@
+import crosshairUrl from "../../../assets/cursors/Cursor=Cross.svg";
+import arrowUrl from "../../../assets/cursors/Cursor=Default.svg";
+import closedHandUrl from "../../../assets/cursors/Cursor=Hand-(Grabbing).svg";
+import openHandUrl from "../../../assets/cursors/Cursor=Hand-(Open).svg";
+import pointerUrl from "../../../assets/cursors/Cursor=Hand-(Pointing).svg";
+import resizeNsUrl from "../../../assets/cursors/Cursor=Resize-North-South.svg";
+import resizeEwUrl from "../../../assets/cursors/Cursor=Resize-West-East.svg";
+import textUrl from "../../../assets/cursors/Cursor=Text-Cursor.svg";
+import type { CursorTelemetryPoint } from "../types";
+
+type CursorAssetKey = NonNullable<CursorTelemetryPoint["cursorType"]>;
+
+export type UploadedCursorAsset = {
+	url: string;
+	trim: {
+		x: number;
+		y: number;
+		width: number;
+		height: number;
+	};
+	fallbackAnchor: {
+		x: number;
+		y: number;
+	};
+};
+
+export const UPLOADED_CURSOR_SAMPLE_SIZE = 1024;
+
+export const uploadedCursorAssets: Partial<Record<CursorAssetKey, UploadedCursorAsset>> = {
+	arrow: {
+		url: arrowUrl,
+		trim: { x: 480, y: 435, width: 333, height: 553 },
+		fallbackAnchor: { x: 0.18, y: 0.1 },
+	},
+	text: {
+		url: textUrl,
+		trim: { x: 404, y: 192, width: 247, height: 596 },
+		fallbackAnchor: { x: 0.5, y: 0.5 },
+	},
+	pointer: {
+		url: pointerUrl,
+		trim: { x: 352, y: 441, width: 466, height: 583 },
+		fallbackAnchor: { x: 0.37, y: 0.08 },
+	},
+	crosshair: {
+		url: crosshairUrl,
+		trim: { x: 288, y: 288, width: 480, height: 480 },
+		fallbackAnchor: { x: 0.5, y: 0.5 },
+	},
+	"open-hand": {
+		url: openHandUrl,
+		trim: { x: 288, y: 188, width: 512, height: 580 },
+		fallbackAnchor: { x: 0.5, y: 0.28 },
+	},
+	"closed-hand": {
+		url: closedHandUrl,
+		trim: { x: 344, y: 365, width: 432, height: 403 },
+		fallbackAnchor: { x: 0.5, y: 0.28 },
+	},
+	"resize-ew": {
+		url: resizeEwUrl,
+		trim: { x: 187, y: 384, width: 669, height: 270 },
+		fallbackAnchor: { x: 0.5, y: 0.5 },
+	},
+	"resize-ns": {
+		url: resizeNsUrl,
+		trim: { x: 376, y: 178, width: 271, height: 669 },
+		fallbackAnchor: { x: 0.5, y: 0.5 },
+	},
+};

From 7a9597add325a32276e208fd9e00e1eec5e1bc1d Mon Sep 17 00:00:00 2001
From: Etienne Lescot <etiennelescot@gmail.com>
Date: Mon, 16 Mar 2026 10:41:35 +0100
Subject: [PATCH 02/38] feat: add unified native bridge foundation

---
 docs/architecture/native-bridge.md            |  39 +++
 electron/electron-env.d.ts                    |   3 +
 electron/ipc/nativeBridge.ts                  | 229 ++++++++++++++++++
 electron/native-bridge/cursor/adapter.ts      |  20 ++
 .../cursor/telemetryCursorAdapter.ts          |  48 ++++
 .../native-bridge/services/cursorService.ts   |  46 ++++
 .../native-bridge/services/projectService.ts  |  80 ++++++
 .../native-bridge/services/systemService.ts   |  43 ++++
 electron/native-bridge/store.ts               |  88 +++++++
 electron/preload.ts                           |   5 +-
 src/components/launch/LaunchWindow.tsx        |   5 +-
 src/hooks/useScreenRecorder.ts                |   3 +-
 src/native/client.ts                          | 133 ++++++++++
 src/native/contracts.ts                       | 209 ++++++++++++++++
 src/native/hooks/useCursorRecordingData.ts    |  61 +++++
 src/native/hooks/useCursorTelemetry.ts        |  61 +++++
 src/native/index.ts                           |   4 +
 17 files changed, 1072 insertions(+), 5 deletions(-)
 create mode 100644 docs/architecture/native-bridge.md
 create mode 100644 electron/ipc/nativeBridge.ts
 create mode 100644 electron/native-bridge/cursor/adapter.ts
 create mode 100644 electron/native-bridge/cursor/telemetryCursorAdapter.ts
 create mode 100644 electron/native-bridge/services/cursorService.ts
 create mode 100644 electron/native-bridge/services/projectService.ts
 create mode 100644 electron/native-bridge/services/systemService.ts
 create mode 100644 electron/native-bridge/store.ts
 create mode 100644 src/native/client.ts
 create mode 100644 src/native/contracts.ts
 create mode 100644 src/native/hooks/useCursorRecordingData.ts
 create mode 100644 src/native/hooks/useCursorTelemetry.ts
 create mode 100644 src/native/index.ts

diff --git a/docs/architecture/native-bridge.md b/docs/architecture/native-bridge.md
new file mode 100644
index 000000000..ef320f777
--- /dev/null
+++ b/docs/architecture/native-bridge.md
@@ -0,0 +1,39 @@
+# Native Bridge Architecture
+
+## Goal
+
+Provide a single, resilient source of truth for platform-native capabilities while keeping Electron transport thin and renderer APIs unified.
+
+## Layers
+
+1. Native adapters
+Platform-specific providers implement stable domain interfaces such as cursor telemetry or system asset discovery.
+
+2. Main-process services
+Services orchestrate adapters, own runtime state, and expose domain-level operations.
+
+3. Unified IPC transport
+Renderer code talks to a single `native-bridge:invoke` channel using versioned contracts.
+
+4. Renderer client
+React code should consume `src/native/client.ts` rather than binding directly to ad hoc Electron APIs.
+
+## Principles
+
+- Single source of truth: runtime-native state lives in the Electron main process.
+- Capability-first: renderer can query support before attempting native behavior.
+- Versioned contracts: requests and responses are explicit and evolve predictably.
+- Resilience: every response uses a consistent result envelope with stable error codes.
+
+## Current rollout
+
+This repository now contains the initial scaffold:
+
+- shared contracts in `src/native/contracts.ts`
+- renderer SDK in `src/native/client.ts`
+- main-process state store in `electron/native-bridge/store.ts`
+- cursor telemetry adapter in `electron/native-bridge/cursor/telemetryCursorAdapter.ts`
+- domain services in `electron/native-bridge/services/*`
+- unified handler registration in `electron/ipc/nativeBridge.ts`
+
+The legacy `window.electronAPI` surface still exists for backward compatibility. New native-facing features should prefer the unified bridge client.
\ No newline at end of file
diff --git a/electron/electron-env.d.ts b/electron/electron-env.d.ts
index d9ebab272..20fa2fe02 100644
--- a/electron/electron-env.d.ts
+++ b/electron/electron-env.d.ts
@@ -24,6 +24,9 @@ declare namespace NodeJS {
 // Used in Renderer process, expose in `preload.ts`
 interface Window {
 	electronAPI: {
+		invokeNativeBridge: <TData = unknown>(
+			request: import("../src/native/contracts").NativeBridgeRequest,
+		) => Promise<import("../src/native/contracts").NativeBridgeResponse<TData>>;
 		getSources: (opts: Electron.SourcesOptions) => Promise<ProcessedDesktopSource[]>;
 		switchToEditor: () => Promise<void>;
 		switchToHud: () => Promise<void>;
diff --git a/electron/ipc/nativeBridge.ts b/electron/ipc/nativeBridge.ts
new file mode 100644
index 000000000..ba6258a30
--- /dev/null
+++ b/electron/ipc/nativeBridge.ts
@@ -0,0 +1,229 @@
+import { ipcMain } from "electron";
+import {
+	NATIVE_BRIDGE_CHANNEL,
+	NATIVE_BRIDGE_VERSION,
+	type NativeBridgeErrorCode,
+	type NativeBridgeRequest,
+	type NativeBridgeResponse,
+	type NativePlatform,
+	type ProjectFileResult,
+	type ProjectPathResult,
+} from "../../src/native/contracts";
+import type { CursorTelemetryLoadResult } from "../native-bridge/cursor/adapter";
+import { TelemetryCursorAdapter } from "../native-bridge/cursor/telemetryCursorAdapter";
+import { CursorService } from "../native-bridge/services/cursorService";
+import { ProjectService } from "../native-bridge/services/projectService";
+import { SystemService } from "../native-bridge/services/systemService";
+import { NativeBridgeStateStore } from "../native-bridge/store";
+
+export interface NativeBridgeContext {
+	getPlatform: () => NodeJS.Platform;
+	getCurrentProjectPath: () => string | null;
+	getCurrentVideoPath: () => string | null;
+	saveProjectFile: (
+		projectData: unknown,
+		suggestedName?: string,
+		existingProjectPath?: string,
+	) => Promise<ProjectFileResult>;
+	loadProjectFile: () => Promise<ProjectFileResult>;
+	loadCurrentProjectFile: () => Promise<ProjectFileResult>;
+	setCurrentVideoPath: (path: string) => ProjectPathResult;
+	getCurrentVideoPathResult: () => ProjectPathResult;
+	clearCurrentVideoPath: () => ProjectPathResult;
+	resolveAssetBasePath: () => string | null;
+	resolveVideoPath: (videoPath?: string | null) => string | null;
+	loadCursorRecordingData: (
+		videoPath: string,
+	) => Promise<import("../../src/native/contracts").CursorRecordingData>;
+	loadCursorTelemetry: (videoPath: string) => Promise<CursorTelemetryLoadResult>;
+}
+
+function normalizePlatform(platform: NodeJS.Platform): NativePlatform {
+	if (platform === "darwin" || platform === "win32") {
+		return platform;
+	}
+
+	return "linux";
+}
+
+function createMeta(requestId?: string) {
+	return {
+		version: NATIVE_BRIDGE_VERSION,
+		requestId: requestId || `native-${Date.now()}`,
+		timestampMs: Date.now(),
+	} as const;
+}
+
+function createSuccessResponse<TData>(requestId: string | undefined, data: TData) {
+	return {
+		ok: true,
+		data,
+		meta: createMeta(requestId),
+	} satisfies NativeBridgeResponse<TData>;
+}
+
+function createErrorResponse(
+	requestId: string | undefined,
+	code: NativeBridgeErrorCode,
+	message: string,
+	retryable = false,
+) {
+	return {
+		ok: false,
+		error: {
+			code,
+			message,
+			retryable,
+		},
+		meta: createMeta(requestId),
+	} satisfies NativeBridgeResponse;
+}
+
+function isBridgeRequest(value: unknown): value is NativeBridgeRequest {
+	if (!value || typeof value !== "object") {
+		return false;
+	}
+
+	const candidate = value as Partial<NativeBridgeRequest>;
+	return typeof candidate.domain === "string" && typeof candidate.action === "string";
+}
+
+export function registerNativeBridgeHandlers(context: NativeBridgeContext) {
+	ipcMain.removeHandler(NATIVE_BRIDGE_CHANNEL);
+
+	const platform = normalizePlatform(context.getPlatform());
+	const store = new NativeBridgeStateStore(platform);
+	const projectService = new ProjectService({
+		store,
+		getCurrentProjectPath: context.getCurrentProjectPath,
+		getCurrentVideoPath: context.getCurrentVideoPath,
+		saveProjectFile: context.saveProjectFile,
+		loadProjectFile: context.loadProjectFile,
+		loadCurrentProjectFile: context.loadCurrentProjectFile,
+		setCurrentVideoPath: context.setCurrentVideoPath,
+		getCurrentVideoPathResult: context.getCurrentVideoPathResult,
+		clearCurrentVideoPath: context.clearCurrentVideoPath,
+	});
+	const cursorService = new CursorService({
+		store,
+		adapter: new TelemetryCursorAdapter({
+			loadRecordingData: context.loadCursorRecordingData,
+			resolveVideoPath: context.resolveVideoPath,
+			loadTelemetry: context.loadCursorTelemetry,
+		}),
+	});
+	const systemService = new SystemService({
+		store,
+		getPlatform: () => platform,
+		getAssetBasePath: context.resolveAssetBasePath,
+		getCursorCapabilities: () => cursorService.getCapabilities(),
+	});
+
+	ipcMain.handle(NATIVE_BRIDGE_CHANNEL, async (_, request: unknown) => {
+		if (!isBridgeRequest(request)) {
+			return createErrorResponse(undefined, "INVALID_REQUEST", "Invalid native bridge request.");
+		}
+
+		const requestId = request.requestId;
+		const domain = request.domain as string;
+
+		try {
+			switch (request.domain) {
+				case "system": {
+					const action = request.action as string;
+					switch (request.action) {
+						case "getPlatform":
+							return createSuccessResponse(requestId, systemService.getPlatform());
+						case "getAssetBasePath":
+							return createSuccessResponse(requestId, systemService.getAssetBasePath());
+						case "getCapabilities":
+							return createSuccessResponse(requestId, await systemService.getCapabilities());
+						default:
+							return createErrorResponse(
+								requestId,
+								"UNSUPPORTED_ACTION",
+								`Unsupported system action: ${action}`,
+							);
+					}
+				}
+
+				case "project": {
+					const action = request.action as string;
+					switch (request.action) {
+						case "getCurrentContext":
+							return createSuccessResponse(requestId, projectService.getCurrentContext());
+						case "saveProjectFile":
+							return createSuccessResponse(
+								requestId,
+								await projectService.saveProjectFile(
+									request.payload.projectData,
+									request.payload.suggestedName,
+									request.payload.existingProjectPath,
+								),
+							);
+						case "loadProjectFile":
+							return createSuccessResponse(requestId, await projectService.loadProjectFile());
+						case "loadCurrentProjectFile":
+							return createSuccessResponse(
+								requestId,
+								await projectService.loadCurrentProjectFile(),
+							);
+						case "setCurrentVideoPath":
+							return createSuccessResponse(
+								requestId,
+								projectService.setCurrentVideoPath(request.payload.path),
+							);
+						case "getCurrentVideoPath":
+							return createSuccessResponse(requestId, projectService.getCurrentVideoPath());
+						case "clearCurrentVideoPath":
+							return createSuccessResponse(requestId, projectService.clearCurrentVideoPath());
+						default:
+							return createErrorResponse(
+								requestId,
+								"UNSUPPORTED_ACTION",
+								`Unsupported project action: ${action}`,
+							);
+					}
+				}
+
+				case "cursor": {
+					const action = request.action as string;
+					switch (request.action) {
+						case "getCapabilities":
+							return createSuccessResponse(requestId, await cursorService.getCapabilities());
+						case "getTelemetry":
+							return createSuccessResponse(
+								requestId,
+								await cursorService.getTelemetry(request.payload?.videoPath),
+							);
+						case "getRecordingData":
+							return createSuccessResponse(
+								requestId,
+								await cursorService.getRecordingData(request.payload?.videoPath),
+							);
+						default:
+							return createErrorResponse(
+								requestId,
+								"UNSUPPORTED_ACTION",
+								`Unsupported cursor action: ${action}`,
+							);
+					}
+				}
+
+				default:
+					return createErrorResponse(
+						requestId,
+						"UNSUPPORTED_ACTION",
+						`Unsupported bridge domain: ${domain}`,
+					);
+			}
+		} catch (error) {
+			return createErrorResponse(
+				requestId,
+				"INTERNAL_ERROR",
+				error instanceof Error ? error.message : "Unknown native bridge error.",
+				true,
+			);
+		}
+	});
+}
diff --git a/electron/native-bridge/cursor/adapter.ts b/electron/native-bridge/cursor/adapter.ts
new file mode 100644
index 000000000..cdb88e24a
--- /dev/null
+++ b/electron/native-bridge/cursor/adapter.ts
@@ -0,0 +1,20 @@
+import type {
+	CursorCapabilities,
+	CursorProviderKind,
+	CursorRecordingData,
+	CursorTelemetryPoint,
+} from "../../../src/native/contracts";
+
+export interface CursorTelemetryLoadResult {
+	success: boolean;
+	samples: CursorTelemetryPoint[];
+	message?: string;
+	error?: string;
+}
+
+export interface CursorNativeAdapter {
+	readonly kind: CursorProviderKind;
+	getCapabilities(): Promise<CursorCapabilities>;
+	getRecordingData(videoPath?: string | null): Promise<CursorRecordingData>;
+	getTelemetry(videoPath?: string | null): Promise<CursorTelemetryLoadResult>;
+}
diff --git a/electron/native-bridge/cursor/telemetryCursorAdapter.ts b/electron/native-bridge/cursor/telemetryCursorAdapter.ts
new file mode 100644
index 000000000..d0839952c
--- /dev/null
+++ b/electron/native-bridge/cursor/telemetryCursorAdapter.ts
@@ -0,0 +1,48 @@
+import type { CursorCapabilities, CursorRecordingData } from "../../../src/native/contracts";
+import type { CursorNativeAdapter, CursorTelemetryLoadResult } from "./adapter";
+
+interface TelemetryCursorAdapterOptions {
+	loadRecordingData: (videoPath: string) => Promise<CursorRecordingData>;
+	resolveVideoPath: (videoPath?: string | null) => string | null;
+	loadTelemetry: (videoPath: string) => Promise<CursorTelemetryLoadResult>;
+}
+
+export class TelemetryCursorAdapter implements CursorNativeAdapter {
+	readonly kind = "none" as const;
+
+	constructor(private readonly options: TelemetryCursorAdapterOptions) {}
+
+	async getCapabilities(): Promise<CursorCapabilities> {
+		return {
+			telemetry: true,
+			systemAssets: false,
+			provider: this.kind,
+		};
+	}
+
+	async getRecordingData(videoPath?: string | null): Promise<CursorRecordingData> {
+		const resolvedVideoPath = this.options.resolveVideoPath(videoPath);
+		if (!resolvedVideoPath) {
+			return {
+				version: 2,
+				provider: this.kind,
+				samples: [],
+				assets: [],
+			};
+		}
+
+		return this.options.loadRecordingData(resolvedVideoPath);
+	}
+
+	async getTelemetry(videoPath?: string | null) {
+		const resolvedVideoPath = this.options.resolveVideoPath(videoPath);
+		if (!resolvedVideoPath) {
+			return {
+				success: true,
+				samples: [],
+			} satisfies CursorTelemetryLoadResult;
+		}
+
+		return this.options.loadTelemetry(resolvedVideoPath);
+	}
+}
diff --git a/electron/native-bridge/services/cursorService.ts b/electron/native-bridge/services/cursorService.ts
new file mode 100644
index 000000000..e3e9a2552
--- /dev/null
+++ b/electron/native-bridge/services/cursorService.ts
@@ -0,0 +1,46 @@
+import type {
+	CursorCapabilities,
+	CursorRecordingData,
+	CursorTelemetryPoint,
+} from "../../../src/native/contracts";
+import type { CursorNativeAdapter } from "../cursor/adapter";
+import type { NativeBridgeStateStore } from "../store";
+
+interface CursorServiceOptions {
+	store: NativeBridgeStateStore;
+	adapter: CursorNativeAdapter;
+}
+
+export class CursorService {
+	constructor(private readonly options: CursorServiceOptions) {}
+
+	async getCapabilities(): Promise<CursorCapabilities> {
+		const capabilities = await this.options.adapter.getCapabilities();
+		this.options.store.setCursorCapabilities(capabilities);
+		return capabilities;
+	}
+
+	async getTelemetry(videoPath?: string | null): Promise<CursorTelemetryPoint[]> {
+		const result = await this.options.adapter.getTelemetry(videoPath);
+		if (!result.success) {
+			throw new Error(result.message || result.error || "Failed to load cursor telemetry");
+		}
+
+		const resolvedVideoPath = videoPath ?? this.options.store.getState().project.currentVideoPath;
+		if (resolvedVideoPath) {
+			this.options.store.markCursorTelemetryLoaded(resolvedVideoPath, result.samples.length);
+		}
+
+		return result.samples;
+	}
+
+	async getRecordingData(videoPath?: string | null): Promise<CursorRecordingData> {
+		const data = await this.options.adapter.getRecordingData(videoPath);
+		const resolvedVideoPath = videoPath ?? this.options.store.getState().project.currentVideoPath;
+		if (resolvedVideoPath) {
+			this.options.store.markCursorTelemetryLoaded(resolvedVideoPath, data.samples.length);
+		}
+
+		return data;
+	}
+}
diff --git a/electron/native-bridge/services/projectService.ts b/electron/native-bridge/services/projectService.ts
new file mode 100644
index 000000000..e8d1cd5cf
--- /dev/null
+++ b/electron/native-bridge/services/projectService.ts
@@ -0,0 +1,80 @@
+import type {
+	ProjectContext,
+	ProjectFileResult,
+	ProjectPathResult,
+} from "../../../src/native/contracts";
+import type { NativeBridgeStateStore } from "../store";
+
+interface ProjectServiceOptions {
+	store: NativeBridgeStateStore;
+	getCurrentProjectPath: () => string | null;
+	getCurrentVideoPath: () => string | null;
+	saveProjectFile: (
+		projectData: unknown,
+		suggestedName?: string,
+		existingProjectPath?: string,
+	) => Promise<ProjectFileResult>;
+	loadProjectFile: () => Promise<ProjectFileResult>;
+	loadCurrentProjectFile: () => Promise<ProjectFileResult>;
+	setCurrentVideoPath: (path: string) => ProjectPathResult;
+	getCurrentVideoPathResult: () => ProjectPathResult;
+	clearCurrentVideoPath: () => ProjectPathResult;
+}
+
+export class ProjectService {
+	constructor(private readonly options: ProjectServiceOptions) {}
+
+	getCurrentContext(): ProjectContext {
+		const context = {
+			currentProjectPath: this.options.getCurrentProjectPath(),
+			currentVideoPath: this.options.getCurrentVideoPath(),
+		};
+
+		this.options.store.setProjectContext(context);
+		return context;
+	}
+
+	async saveProjectFile(
+		projectData: unknown,
+		suggestedName?: string,
+		existingProjectPath?: string,
+	) {
+		const result = await this.options.saveProjectFile(
+			projectData,
+			suggestedName,
+			existingProjectPath,
+		);
+		this.getCurrentContext();
+		return result;
+	}
+
+	async loadProjectFile() {
+		const result = await this.options.loadProjectFile();
+		this.getCurrentContext();
+		return result;
+	}
+
+	async loadCurrentProjectFile() {
+		const result = await this.options.loadCurrentProjectFile();
+		this.getCurrentContext();
+		return result;
+	}
+
+	setCurrentVideoPath(path: string) {
+		const result = this.options.setCurrentVideoPath(path);
+		this.getCurrentContext();
+		return result;
+	}
+
+	getCurrentVideoPath() {
+		const result = this.options.getCurrentVideoPathResult();
+		this.getCurrentContext();
+		return result;
+	}
+
+	clearCurrentVideoPath() {
+		const result = this.options.clearCurrentVideoPath();
+		this.getCurrentContext();
+		return result;
+	}
+}
diff --git a/electron/native-bridge/services/systemService.ts b/electron/native-bridge/services/systemService.ts
new file mode 100644
index 000000000..50eff2838
--- /dev/null
+++ b/electron/native-bridge/services/systemService.ts
@@ -0,0 +1,43 @@
+import type {
+	CursorCapabilities,
+	NativePlatform,
+	SystemCapabilities,
+} from "../../../src/native/contracts";
+import { NATIVE_BRIDGE_VERSION } from "../../../src/native/contracts";
+import type { NativeBridgeStateStore } from "../store";
+
+interface SystemServiceOptions {
+	store: NativeBridgeStateStore;
+	getPlatform: () => NativePlatform;
+	getAssetBasePath: () => string | null;
+	getCursorCapabilities: () => Promise<CursorCapabilities>;
+}
+
+export class SystemService {
+	constructor(private readonly options: SystemServiceOptions) {}
+
+	getPlatform() {
+		return this.options.getPlatform();
+	}
+
+	getAssetBasePath() {
+		return this.options.getAssetBasePath();
+	}
+
+	async getCapabilities(): Promise<SystemCapabilities> {
+		const platform = this.getPlatform();
+		const cursorCapabilities = await this.options.getCursorCapabilities();
+
+		const capabilities: SystemCapabilities = {
+			bridgeVersion: NATIVE_BRIDGE_VERSION,
+			platform,
+			cursor: cursorCapabilities,
+			project: {
+				currentContext: true,
+			},
+		};
+
+		this.options.store.setSystemCapabilities(capabilities);
+		return capabilities;
+	}
+}
diff --git a/electron/native-bridge/store.ts b/electron/native-bridge/store.ts
new file mode 100644
index 000000000..dcdbed154
--- /dev/null
+++ b/electron/native-bridge/store.ts
@@ -0,0 +1,88 @@
+import type {
+	CursorCapabilities,
+	NativePlatform,
+	ProjectContext,
+	SystemCapabilities,
+} from "../../src/native/contracts";
+
+export interface NativeBridgeState {
+	system: {
+		platform: NativePlatform;
+		capabilities: SystemCapabilities | null;
+	};
+	project: ProjectContext;
+	cursor: {
+		capabilities: CursorCapabilities | null;
+		lastTelemetryLoad: {
+			videoPath: string;
+			sampleCount: number;
+			loadedAt: number;
+		} | null;
+	};
+}
+
+export class NativeBridgeStateStore {
+	private state: NativeBridgeState;
+
+	constructor(platform: NativePlatform) {
+		this.state = {
+			system: {
+				platform,
+				capabilities: null,
+			},
+			project: {
+				currentProjectPath: null,
+				currentVideoPath: null,
+			},
+			cursor: {
+				capabilities: null,
+				lastTelemetryLoad: null,
+			},
+		};
+	}
+
+	getState() {
+		return this.state;
+	}
+
+	setProjectContext(project: ProjectContext) {
+		this.state = {
+			...this.state,
+			project,
+		};
+	}
+
+	setSystemCapabilities(capabilities: SystemCapabilities) {
+		this.state = {
+			...this.state,
+			system: {
+				...this.state.system,
+				capabilities,
+			},
+		};
+	}
+
+	setCursorCapabilities(capabilities: CursorCapabilities) {
+		this.state = {
+			...this.state,
+			cursor: {
+				...this.state.cursor,
+				capabilities,
+			},
+		};
+	}
+
+	markCursorTelemetryLoaded(videoPath: string, sampleCount: number) {
+		this.state = {
+			...this.state,
+			cursor: {
+				...this.state.cursor,
+				lastTelemetryLoad: {
+					videoPath,
+					sampleCount,
+					loadedAt: Date.now(),
+				},
+			},
+		};
+	}
+}
diff --git a/electron/preload.ts b/electron/preload.ts
index 6c705d7b8..ddf56825d 100644
--- a/electron/preload.ts
+++ b/electron/preload.ts
@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from "electron";
-import type { RecordingSession, StoreRecordedSessionInput } from "../src/lib/recordingSession";
+import { NATIVE_BRIDGE_CHANNEL, type NativeBridgeRequest } from "../src/native/contracts";
 
 // Asset base URL is passed from the main process via webPreferences.additionalArguments
 // (see windows.ts). Sandboxed preloads cannot import node:path / node:url, so we
@@ -10,6 +10,9 @@ const assetBaseUrl = assetBaseUrlArg ? assetBaseUrlArg.slice(ASSET_BASE_URL_ARG_
 
 contextBridge.exposeInMainWorld("electronAPI", {
 	assetBaseUrl,
+	invokeNativeBridge: <TData>(request: NativeBridgeRequest) => {
+		return ipcRenderer.invoke(NATIVE_BRIDGE_CHANNEL, request) as Promise<TData>;
+	},
 	hudOverlayHide: () => {
 		ipcRenderer.send("hud-overlay-hide");
 	},
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index bffbd9c9a..546ffcc91 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -20,6 +20,7 @@ import {
 import { RxDragHandleDots2 } from "react-icons/rx";
 import { useI18n, useScopedT } from "@/contexts/I18nContext";
 import { getAvailableLocales, getLocaleName } from "@/i18n/loader";
+import { nativeBridgeClient } from "@/native";
 import { useAudioLevelMeter } from "../../hooks/useAudioLevelMeter";
 import { useCameraDevices } from "../../hooks/useCameraDevices";
 import { useMicrophoneDevices } from "../../hooks/useMicrophoneDevices";
@@ -285,13 +286,13 @@ export function LaunchWindow() {
 		}
 
 		if (result.success && result.path) {
-			await window.electronAPI.setCurrentVideoPath(result.path);
+			await nativeBridgeClient.project.setCurrentVideoPath(result.path);
 			await window.electronAPI.switchToEditor();
 		}
 	};
 
 	const openProjectFile = async () => {
-		const result = await window.electronAPI.loadProjectFile();
+		const result = await nativeBridgeClient.project.loadProjectFile();
 		if (result.canceled || !result.success) return;
 		await window.electronAPI.switchToEditor();
 	};
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index dc9758fbd..9401b9c8d 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -1,8 +1,7 @@
 import { fixWebmDuration } from "@fix-webm-duration/fix";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
-import { useScopedT } from "@/contexts/I18nContext";
-import { requestCameraAccess } from "@/lib/requestCameraAccess";
+import { nativeBridgeClient } from "@/native";
 
 const TARGET_FRAME_RATE = 60;
 const MIN_FRAME_RATE = 30;
diff --git a/src/native/client.ts b/src/native/client.ts
new file mode 100644
index 000000000..3f53ce483
--- /dev/null
+++ b/src/native/client.ts
@@ -0,0 +1,133 @@
+import {
+	type CursorCapabilities,
+	type CursorRecordingData,
+	type CursorTelemetryPoint,
+	NATIVE_BRIDGE_CHANNEL,
+	type NativeBridgeRequest,
+	type NativeBridgeResponse,
+	type NativePlatform,
+	type ProjectContext,
+	type ProjectFileResult,
+	type ProjectPathResult,
+	type SystemCapabilities,
+} from "./contracts";
+
+function createRequestId() {
+	if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+		return crypto.randomUUID();
+	}
+
+	return `req-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+}
+
+function getElectronBridge() {
+	if (!window.electronAPI?.invokeNativeBridge) {
+		throw new Error(
+			`Native bridge unavailable. Expected ${NATIVE_BRIDGE_CHANNEL} transport in preload.`,
+		);
+	}
+
+	return window.electronAPI.invokeNativeBridge;
+}
+
+export async function invokeNativeBridge<TData = unknown>(
+	request: NativeBridgeRequest,
+): Promise<NativeBridgeResponse<TData>> {
+	const invoke = getElectronBridge();
+	return invoke({
+		...request,
+		requestId: request.requestId ?? createRequestId(),
+	});
+}
+
+export async function requireNativeBridgeData<TData>(request: NativeBridgeRequest): Promise<TData> {
+	const response = await invokeNativeBridge<TData>(request);
+	if (!response.ok) {
+		throw new Error(response.error.message);
+	}
+
+	return response.data;
+}
+
+export const nativeBridgeClient = {
+	rawInvoke: invokeNativeBridge,
+	system: {
+		getPlatform: () =>
+			requireNativeBridgeData<NativePlatform>({
+				domain: "system",
+				action: "getPlatform",
+			}),
+		getAssetBasePath: () =>
+			requireNativeBridgeData<string | null>({
+				domain: "system",
+				action: "getAssetBasePath",
+			}),
+		getCapabilities: () =>
+			requireNativeBridgeData<SystemCapabilities>({
+				domain: "system",
+				action: "getCapabilities",
+			}),
+	},
+	project: {
+		getCurrentContext: () =>
+			requireNativeBridgeData<ProjectContext>({
+				domain: "project",
+				action: "getCurrentContext",
+			}),
+		saveProjectFile: (projectData: unknown, suggestedName?: string, existingProjectPath?: string) =>
+			requireNativeBridgeData<ProjectFileResult>({
+				domain: "project",
+				action: "saveProjectFile",
+				payload: {
+					projectData,
+					suggestedName,
+					existingProjectPath,
+				},
+			}),
+		loadProjectFile: () =>
+			requireNativeBridgeData<ProjectFileResult>({
+				domain: "project",
+				action: "loadProjectFile",
+			}),
+		loadCurrentProjectFile: () =>
+			requireNativeBridgeData<ProjectFileResult>({
+				domain: "project",
+				action: "loadCurrentProjectFile",
+			}),
+		setCurrentVideoPath: (path: string) =>
+			requireNativeBridgeData<ProjectPathResult>({
+				domain: "project",
+				action: "setCurrentVideoPath",
+				payload: { path },
+			}),
+		getCurrentVideoPath: () =>
+			requireNativeBridgeData<ProjectPathResult>({
+				domain: "project",
+				action: "getCurrentVideoPath",
+			}),
+		clearCurrentVideoPath: () =>
+			requireNativeBridgeData<ProjectPathResult>({
+				domain: "project",
+				action: "clearCurrentVideoPath",
+			}),
+	},
+	cursor: {
+		getCapabilities: () =>
+			requireNativeBridgeData<CursorCapabilities>({
+				domain: "cursor",
+				action: "getCapabilities",
+			}),
+		getRecordingData: (videoPath?: string) =>
+			requireNativeBridgeData<CursorRecordingData>({
+				domain: "cursor",
+				action: "getRecordingData",
+				payload: videoPath ? { videoPath } : {},
+			}),
+		getTelemetry: (videoPath?: string) =>
+			requireNativeBridgeData<CursorTelemetryPoint[]>({
+				domain: "cursor",
+				action: "getTelemetry",
+				payload: videoPath ? { videoPath } : {},
+			}),
+	},
+};
diff --git a/src/native/contracts.ts b/src/native/contracts.ts
new file mode 100644
index 000000000..73d53dbbf
--- /dev/null
+++ b/src/native/contracts.ts
@@ -0,0 +1,209 @@
+export const NATIVE_BRIDGE_CHANNEL = "native-bridge:invoke";
+export const NATIVE_BRIDGE_VERSION = 1;
+
+export type NativePlatform = "darwin" | "win32" | "linux";
+export type CursorProviderKind = "native" | "none";
+
+export interface CursorTelemetryPoint {
+	timeMs: number;
+	cx: number;
+	cy: number;
+}
+
+export interface CursorRecordingSample extends CursorTelemetryPoint {
+	assetId?: string | null;
+	visible?: boolean;
+}
+
+export interface NativeCursorAsset {
+	id: string;
+	platform: NativePlatform;
+	imageDataUrl: string;
+	width: number;
+	height: number;
+	hotspotX: number;
+	hotspotY: number;
+	scaleFactor?: number;
+}
+
+export interface CursorRecordingData {
+	version: number;
+	provider: CursorProviderKind;
+	samples: CursorRecordingSample[];
+	assets: NativeCursorAsset[];
+}
+
+export interface CursorCapabilities {
+	telemetry: boolean;
+	systemAssets: boolean;
+	provider: CursorProviderKind;
+}
+
+export interface SystemCapabilities {
+	bridgeVersion: typeof NATIVE_BRIDGE_VERSION;
+	platform: NativePlatform;
+	cursor: CursorCapabilities;
+	project: {
+		currentContext: boolean;
+	};
+}
+
+export interface ProjectContext {
+	currentProjectPath: string | null;
+	currentVideoPath: string | null;
+}
+
+export interface ProjectPathResult {
+	success: boolean;
+	path?: string;
+	message?: string;
+	canceled?: boolean;
+	error?: string;
+}
+
+export interface ProjectFileResult {
+	success: boolean;
+	path?: string;
+	project?: unknown;
+	message?: string;
+	canceled?: boolean;
+	error?: string;
+}
+
+export type NativeBridgeErrorCode =
+	| "INVALID_REQUEST"
+	| "UNSUPPORTED_ACTION"
+	| "NOT_FOUND"
+	| "UNAVAILABLE"
+	| "INTERNAL_ERROR";
+
+export interface NativeBridgeError {
+	code: NativeBridgeErrorCode;
+	message: string;
+	retryable: boolean;
+}
+
+export interface NativeBridgeMeta {
+	version: typeof NATIVE_BRIDGE_VERSION;
+	requestId: string;
+	timestampMs: number;
+}
+
+export interface NativeBridgeSuccess<TData> {
+	ok: true;
+	data: TData;
+	meta: NativeBridgeMeta;
+}
+
+export interface NativeBridgeFailure {
+	ok: false;
+	error: NativeBridgeError;
+	meta: NativeBridgeMeta;
+}
+
+export type NativeBridgeResponse<TData = unknown> =
+	| NativeBridgeSuccess<TData>
+	| NativeBridgeFailure;
+
+type EmptyPayload = Record<string, never>;
+
+export type NativeBridgeRequest =
+	| {
+			domain: "system";
+			action: "getPlatform";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "system";
+			action: "getAssetBasePath";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "system";
+			action: "getCapabilities";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "getCurrentContext";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "saveProjectFile";
+			payload: {
+				projectData: unknown;
+				suggestedName?: string;
+				existingProjectPath?: string;
+			};
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "loadProjectFile";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "loadCurrentProjectFile";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "setCurrentVideoPath";
+			payload: {
+				path: string;
+			};
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "getCurrentVideoPath";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "project";
+			action: "clearCurrentVideoPath";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "cursor";
+			action: "getCapabilities";
+			payload?: EmptyPayload;
+			requestId?: string;
+	  }
+	| {
+			domain: "cursor";
+			action: "getTelemetry";
+			payload?: {
+				videoPath?: string;
+			};
+			requestId?: string;
+	  }
+	| {
+			domain: "cursor";
+			action: "getRecordingData";
+			payload?: {
+				videoPath?: string;
+			};
+			requestId?: string;
+	  };
+
+export type NativeBridgeEventName =
+	| "project.contextChanged"
+	| "cursor.providerChanged"
+	| "cursor.telemetryLoaded";
+
+export interface NativeBridgeEvent<TPayload = unknown> {
+	name: NativeBridgeEventName;
+	payload: TPayload;
+	meta: NativeBridgeMeta;
+}
diff --git a/src/native/hooks/useCursorRecordingData.ts b/src/native/hooks/useCursorRecordingData.ts
new file mode 100644
index 000000000..6b3451a88
--- /dev/null
+++ b/src/native/hooks/useCursorRecordingData.ts
@@ -0,0 +1,61 @@
+import { useEffect, useState } from "react";
+import type { CursorRecordingData } from "@/native/contracts";
+import { nativeBridgeClient } from "../client";
+
+interface UseCursorRecordingDataResult {
+	data: CursorRecordingData | null;
+	loading: boolean;
+	error: string | null;
+}
+
+export function useCursorRecordingData(videoPath: string | null): UseCursorRecordingDataResult {
+	const [data, setData] = useState<CursorRecordingData | null>(null);
+	const [loading, setLoading] = useState(false);
+	const [error, setError] = useState<string | null>(null);
+
+	useEffect(() => {
+		let cancelled = false;
+
+		async function loadCursorRecordingData() {
+			if (!videoPath) {
+				setData(null);
+				setLoading(false);
+				setError(null);
+				return;
+			}
+
+			setLoading(true);
+			setError(null);
+
+			try {
+				const nextData = await nativeBridgeClient.cursor.getRecordingData(videoPath);
+				if (!cancelled) {
+					setData(nextData);
+				}
+			} catch (nextError) {
+				if (!cancelled) {
+					setData(null);
+					setError(
+						nextError instanceof Error ? nextError.message : "Failed to load cursor recording data",
+					);
+				}
+			} finally {
+				if (!cancelled) {
+					setLoading(false);
+				}
+			}
+		}
+
+		loadCursorRecordingData();
+
+		return () => {
+			cancelled = true;
+		};
+	}, [videoPath]);
+
+	return {
+		data,
+		loading,
+		error,
+	};
+}
diff --git a/src/native/hooks/useCursorTelemetry.ts b/src/native/hooks/useCursorTelemetry.ts
new file mode 100644
index 000000000..161768054
--- /dev/null
+++ b/src/native/hooks/useCursorTelemetry.ts
@@ -0,0 +1,61 @@
+import { useEffect, useState } from "react";
+import type { CursorTelemetryPoint } from "@/components/video-editor/types";
+import { nativeBridgeClient } from "../client";
+
+interface UseCursorTelemetryResult {
+	samples: CursorTelemetryPoint[];
+	loading: boolean;
+	error: string | null;
+}
+
+export function useCursorTelemetry(videoPath: string | null): UseCursorTelemetryResult {
+	const [samples, setSamples] = useState<CursorTelemetryPoint[]>([]);
+	const [loading, setLoading] = useState(false);
+	const [error, setError] = useState<string | null>(null);
+
+	useEffect(() => {
+		let cancelled = false;
+
+		async function loadCursorTelemetry() {
+			if (!videoPath) {
+				setSamples([]);
+				setLoading(false);
+				setError(null);
+				return;
+			}
+
+			setLoading(true);
+			setError(null);
+
+			try {
+				const nextSamples = await nativeBridgeClient.cursor.getTelemetry(videoPath);
+				if (!cancelled) {
+					setSamples(nextSamples);
+				}
+			} catch (nextError) {
+				if (!cancelled) {
+					setSamples([]);
+					setError(
+						nextError instanceof Error ? nextError.message : "Failed to load cursor telemetry",
+					);
+				}
+			} finally {
+				if (!cancelled) {
+					setLoading(false);
+				}
+			}
+		}
+
+		loadCursorTelemetry();
+
+		return () => {
+			cancelled = true;
+		};
+	}, [videoPath]);
+
+	return {
+		samples,
+		loading,
+		error,
+	};
+}
diff --git a/src/native/index.ts b/src/native/index.ts
new file mode 100644
index 000000000..817d1cf14
--- /dev/null
+++ b/src/native/index.ts
@@ -0,0 +1,4 @@
+export * from "./client";
+export * from "./contracts";
+export * from "./hooks/useCursorRecordingData";
+export * from "./hooks/useCursorTelemetry";

From e85a2a38095ec94b65b8e8be02551d8c03544259 Mon Sep 17 00:00:00 2001
From: Etienne Lescot <etiennelescot@gmail.com>
Date: Mon, 16 Mar 2026 10:41:46 +0100
Subject: [PATCH 03/38] feat: add windows native cursor capture and rendering

---
 electron/ipc/handlers.ts                      | 1011 ++++++-----------
 .../native-bridge/cursor/recording/factory.ts |   29 +
 .../native-bridge/cursor/recording/session.ts |    6 +
 .../recording/telemetryRecordingSession.ts    |   62 +
 .../windowsNativeRecordingSession.ts          |  326 ++++++
 src/components/video-editor/VideoEditor.tsx   |   78 +-
 src/components/video-editor/VideoPlayback.tsx |  224 +++-
 .../video-editor/timeline/TimelineEditor.tsx  |   12 +-
 src/lib/cursor/nativeCursor.ts                |  101 ++
 src/lib/exporter/frameRenderer.ts             |   69 +-
 src/lib/exporter/gifExporter.ts               |    3 +
 src/lib/exporter/videoExporter.ts             |    3 +
 12 files changed, 1189 insertions(+), 735 deletions(-)
 create mode 100644 electron/native-bridge/cursor/recording/factory.ts
 create mode 100644 electron/native-bridge/cursor/recording/session.ts
 create mode 100644 electron/native-bridge/cursor/recording/telemetryRecordingSession.ts
 create mode 100644 electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
 create mode 100644 src/lib/cursor/nativeCursor.ts

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 7361b26fc..74080035b 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 
 const nodeRequire = createRequire(import.meta.url);
 
@@ -26,8 +26,18 @@ import {
 	type RecordingSession,
 	type StoreRecordedSessionInput,
 } from "../../src/lib/recordingSession";
+import type {
+	CursorRecordingData,
+	CursorRecordingSample,
+	NativeCursorAsset,
+	ProjectFileResult,
+	ProjectPathResult,
+} from "../../src/native/contracts";
 import { mainT } from "../i18n";
 import { RECORDINGS_DIR } from "../main";
+import { createCursorRecordingSession } from "../native-bridge/cursor/recording/factory";
+import type { CursorRecordingSession } from "../native-bridge/cursor/recording/session";
+import { registerNativeBridgeHandlers } from "./nativeBridge";
 
 const PROJECT_FILE_EXTENSION = "openscreen";
 const SHORTCUTS_FILE = path.join(app.getPath("userData"), "shortcuts.json");
@@ -192,7 +202,7 @@ type SelectedSource = {
 
 let selectedSource: SelectedSource | null = null;
 let currentProjectPath: string | null = null;
-let currentRecordingSession: RecordingSession | null = null;
+let currentVideoPath: string | null = null;
 
 function normalizePath(filePath: string) {
 	return path.resolve(filePath);
@@ -226,450 +236,180 @@ function isTrustedProjectPath(filePath?: string | null) {
 	return normalizePath(filePath) === normalizePath(currentProjectPath);
 }
 
-function setCurrentRecordingSessionState(session: RecordingSession | null) {
-	currentRecordingSession = session;
-}
-
-function getSessionManifestPathForVideo(videoPath: string) {
-	const parsed = path.parse(videoPath);
-	const baseName = parsed.name.endsWith("-webcam")
-		? parsed.name.slice(0, -"-webcam".length)
-		: parsed.name;
-	return path.join(parsed.dir, `${baseName}${RECORDING_SESSION_SUFFIX}`);
-}
-
-async function loadRecordedSessionForVideoPath(
-	videoPath: string,
-): Promise<RecordingSession | null> {
-	const normalizedVideoPath = normalizeVideoSourcePath(videoPath);
-	if (!normalizedVideoPath) {
-		return null;
-	}
-
-	try {
-		const manifestPath = getSessionManifestPathForVideo(normalizedVideoPath);
-		const content = await fs.readFile(manifestPath, "utf-8");
-		const session = normalizeRecordingSession(JSON.parse(content));
-		if (!session) {
-			return null;
-		}
-
-		const normalizedSession: RecordingSession = {
-			...session,
-			screenVideoPath: normalizeVideoSourcePath(session.screenVideoPath) ?? session.screenVideoPath,
-			...(session.webcamVideoPath
-				? {
-						webcamVideoPath:
-							normalizeVideoSourcePath(session.webcamVideoPath) ?? session.webcamVideoPath,
-					}
-				: {}),
-		};
-
-		const targetPath = normalizePath(normalizedVideoPath);
-		const screenMatches = normalizePath(normalizedSession.screenVideoPath) === targetPath;
-		const webcamMatches = normalizedSession.webcamVideoPath
-			? normalizePath(normalizedSession.webcamVideoPath) === targetPath
-			: false;
-
-		return screenMatches || webcamMatches ? normalizedSession : null;
-	} catch {
-		return null;
-	}
-}
-
-async function storeRecordedSessionFiles(payload: StoreRecordedSessionInput) {
-	const createdAt =
-		typeof payload.createdAt === "number" && Number.isFinite(payload.createdAt)
-			? payload.createdAt
-			: Date.now();
-	const screenVideoPath = resolveRecordingOutputPath(payload.screen.fileName);
-	await fs.writeFile(screenVideoPath, Buffer.from(payload.screen.videoData));
-
-	let webcamVideoPath: string | undefined;
-	if (payload.webcam) {
-		webcamVideoPath = resolveRecordingOutputPath(payload.webcam.fileName);
-		await fs.writeFile(webcamVideoPath, Buffer.from(payload.webcam.videoData));
-	}
-
-	const session: RecordingSession = webcamVideoPath
-		? { screenVideoPath, webcamVideoPath, createdAt }
-		: { screenVideoPath, createdAt };
-	setCurrentRecordingSessionState(session);
-	currentProjectPath = null;
-
-	const telemetryPath = `${screenVideoPath}.cursor.json`;
-	const pendingBatch = cursorTelemetryBuffer.takeNextBatch();
-	const pendingClicks = takeCursorClickTimestamps();
-	if ((pendingBatch && pendingBatch.samples.length > 0) || pendingClicks.length > 0) {
-		try {
-			await fs.writeFile(
-				telemetryPath,
-				JSON.stringify(
-					{
-						version: CURSOR_TELEMETRY_VERSION,
-						samples: pendingBatch?.samples ?? [],
-						clicks: pendingClicks,
-					},
-					null,
-					2,
-				),
-				"utf-8",
-			);
-		} catch (err) {
-			if (pendingBatch) cursorTelemetryBuffer.prependBatch(pendingBatch);
-			throw err;
-		}
-	}
-
-	const sessionManifestPath = path.join(
-		RECORDINGS_DIR,
-		`${path.parse(payload.screen.fileName).name}${RECORDING_SESSION_SUFFIX}`,
-	);
-	await fs.writeFile(sessionManifestPath, JSON.stringify(session, null, 2), "utf-8");
-
-	return {
-		success: true,
-		path: screenVideoPath,
-		session,
-		message: "Recording session stored successfully",
-	};
-}
-
-const CURSOR_TELEMETRY_VERSION = 1;
+const CURSOR_TELEMETRY_VERSION = 2;
 const CURSOR_SAMPLE_INTERVAL_MS = 100;
 const MAX_CURSOR_SAMPLES = 60 * 60 * 10; // 1 hour @ 10Hz
 
-let cursorCaptureInterval: NodeJS.Timeout | null = null;
-let cursorCaptureStartTimeMs = 0;
-const cursorTelemetryBuffer = createCursorTelemetryBuffer({
-	maxActiveSamples: MAX_CURSOR_SAMPLES,
-});
-
-// Mouse click timestamps (macOS only — uiohook-napi behind Accessibility).
-const MAX_CURSOR_CLICKS = 60 * 60 * 60; // ~1 click/sec for an hour
-let cursorClickTimestampsMs: number[] = [];
-let uioHookInstance: {
-	start: () => void;
-	stop: () => void;
-	on: (...a: unknown[]) => void;
-	off?: (...a: unknown[]) => void;
-	removeListener?: (...a: unknown[]) => void;
-} | null = null;
-let uioHookMouseDownHandler: ((event: { time?: number }) => void) | null = null;
-let uioHookFailureLogged = false;
+let cursorRecordingSession: CursorRecordingSession | null = null;
+let pendingCursorRecordingData: CursorRecordingData | null = null;
 
 function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
-function loadUioHookForClicks(): typeof uioHookInstance {
-	try {
-		// Dynamic require + try/catch so a broken native binary doesn't crash startup.
-		const mod = nodeRequire("uiohook-napi");
-		const candidate = mod.uIOhook ?? mod.default?.uIOhook ?? mod.uiohook ?? mod.default;
-		if (candidate && typeof candidate.start === "function" && typeof candidate.on === "function") {
-			return candidate;
-		}
-		return null;
-	} catch (error) {
-		if (!uioHookFailureLogged) {
-			uioHookFailureLogged = true;
-			console.warn("[clickCapture] uiohook-napi unavailable:", error);
-		}
+function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
+	if (!sample || typeof sample !== "object") {
 		return null;
 	}
-}
 
-function startClickCapture() {
-	if (process.platform !== "darwin") return;
-	if (uioHookInstance) return;
+	const point = sample as Partial<CursorRecordingSample>;
+	return {
+		timeMs:
+			typeof point.timeMs === "number" && Number.isFinite(point.timeMs)
+				? Math.max(0, point.timeMs)
+				: 0,
+		cx: typeof point.cx === "number" && Number.isFinite(point.cx) ? clamp(point.cx, 0, 1) : 0.5,
+		cy: typeof point.cy === "number" && Number.isFinite(point.cy) ? clamp(point.cy, 0, 1) : 0.5,
+		assetId: typeof point.assetId === "string" ? point.assetId : null,
+		visible: typeof point.visible === "boolean" ? point.visible : true,
+	};
+}
 
-	// Passive check — the prompt fires from the renderer when the user toggles
-	// "Only on clicks" so it doesn't stack with the screen-recording prompt.
-	try {
-		if (!systemPreferences.isTrustedAccessibilityClient(false)) {
-			if (!uioHookFailureLogged) {
-				uioHookFailureLogged = true;
-				console.warn(
-					"[clickCapture] Accessibility permission not granted — click capture disabled.",
-				);
-			}
-			return;
-		}
-	} catch {
-		// fall through; uiohook will fail defensively below
+function normalizeCursorAsset(asset: unknown): NativeCursorAsset | null {
+	if (!asset || typeof asset !== "object") {
+		return null;
 	}
 
-	const hook = loadUioHookForClicks();
-	if (!hook) return;
+	const candidate = asset as Partial<NativeCursorAsset>;
+	if (typeof candidate.id !== "string" || typeof candidate.imageDataUrl !== "string") {
+		return null;
+	}
 
-	uioHookMouseDownHandler = (event) => {
-		const elapsed = Math.max(0, Date.now() - cursorCaptureStartTimeMs);
-		void event;
-		if (cursorClickTimestampsMs.length >= MAX_CURSOR_CLICKS) return;
-		cursorClickTimestampsMs.push(elapsed);
+	return {
+		id: candidate.id,
+		platform:
+			candidate.platform === "win32" ? "win32" : process.platform === "darwin" ? "darwin" : "linux",
+		imageDataUrl: candidate.imageDataUrl,
+		width:
+			typeof candidate.width === "number" && Number.isFinite(candidate.width)
+				? Math.max(1, Math.round(candidate.width))
+				: 1,
+		height:
+			typeof candidate.height === "number" && Number.isFinite(candidate.height)
+				? Math.max(1, Math.round(candidate.height))
+				: 1,
+		hotspotX:
+			typeof candidate.hotspotX === "number" && Number.isFinite(candidate.hotspotX)
+				? Math.max(0, Math.round(candidate.hotspotX))
+				: 0,
+		hotspotY:
+			typeof candidate.hotspotY === "number" && Number.isFinite(candidate.hotspotY)
+				? Math.max(0, Math.round(candidate.hotspotY))
+				: 0,
+		scaleFactor:
+			typeof candidate.scaleFactor === "number" && Number.isFinite(candidate.scaleFactor)
+				? Math.max(0.1, candidate.scaleFactor)
+				: undefined,
 	};
+}
 
+async function readCursorRecordingFile(targetVideoPath: string): Promise<CursorRecordingData> {
+	const telemetryPath = `${targetVideoPath}.cursor.json`;
 	try {
-		hook.on("mousedown", uioHookMouseDownHandler);
-		hook.start();
-		uioHookInstance = hook;
+		const content = await fs.readFile(telemetryPath, "utf-8");
+		const parsed = JSON.parse(content);
+		const rawSamples = Array.isArray(parsed)
+			? parsed
+			: Array.isArray(parsed?.samples)
+				? parsed.samples
+				: [];
+		const rawAssets = Array.isArray(parsed?.assets) ? parsed.assets : [];
+
+		const samples = rawSamples
+			.map((sample: unknown) => normalizeCursorSample(sample))
+			.filter((sample: CursorRecordingSample | null): sample is CursorRecordingSample =>
+				Boolean(sample),
+			)
+			.sort((a: CursorRecordingSample, b: CursorRecordingSample) => a.timeMs - b.timeMs);
+
+		const assets = rawAssets
+			.map((asset: unknown) => normalizeCursorAsset(asset))
+			.filter((asset: NativeCursorAsset | null): asset is NativeCursorAsset => Boolean(asset));
+
+		return {
+			version:
+				typeof parsed?.version === "number" && Number.isFinite(parsed.version) ? parsed.version : 1,
+			provider: parsed?.provider === "native" ? "native" : "none",
+			samples,
+			assets,
+		};
 	} catch (error) {
-		if (!uioHookFailureLogged) {
-			uioHookFailureLogged = true;
-			console.warn("[clickCapture] failed to start uiohook:", error);
+		const nodeError = error as NodeJS.ErrnoException;
+		if (nodeError.code === "ENOENT") {
+			return {
+				version: CURSOR_TELEMETRY_VERSION,
+				provider: "none",
+				samples: [],
+				assets: [],
+			};
 		}
-		uioHookMouseDownHandler = null;
+
+		console.error("Failed to load cursor telemetry:", error);
+		throw error;
 	}
 }
 
-function stopClickCapture() {
-	if (!uioHookInstance) return;
+async function readCursorTelemetryFile(targetVideoPath: string) {
 	try {
-		if (uioHookMouseDownHandler) {
-			if (typeof uioHookInstance.off === "function") {
-				uioHookInstance.off("mousedown", uioHookMouseDownHandler);
-			} else if (typeof uioHookInstance.removeListener === "function") {
-				uioHookInstance.removeListener("mousedown", uioHookMouseDownHandler);
-			}
-		}
-		uioHookInstance.stop();
+		const recordingData = await readCursorRecordingFile(targetVideoPath);
+		return {
+			success: true,
+			samples: recordingData.samples.map((sample) => ({
+				timeMs: sample.timeMs,
+				cx: sample.cx,
+				cy: sample.cy,
+			})),
+		};
 	} catch (error) {
-		console.warn("[clickCapture] failed to stop uiohook:", error);
+		console.error("Failed to load cursor telemetry:", error);
+		return {
+			success: false,
+			message: "Failed to load cursor telemetry",
+			error: String(error),
+			samples: [],
+		};
 	}
-	uioHookInstance = null;
-	uioHookMouseDownHandler = null;
 }
 
-function takeCursorClickTimestamps(): number[] {
-	const out = cursorClickTimestampsMs;
-	cursorClickTimestampsMs = [];
-	return out;
-}
-
-function stopCursorCapture() {
-	if (cursorCaptureInterval) {
-		clearInterval(cursorCaptureInterval);
-		cursorCaptureInterval = null;
+function resolveAssetBasePath() {
+	try {
+		if (app.isPackaged) {
+			const assetPath = path.join(process.resourcesPath, "assets");
+			return pathToFileURL(`${assetPath}${path.sep}`).toString();
+		}
+		const assetPath = path.join(app.getAppPath(), "public", "assets");
+		return pathToFileURL(`${assetPath}${path.sep}`).toString();
+	} catch (err) {
+		console.error("Failed to resolve asset base path:", err);
+		return null;
 	}
-	stopClickCapture();
 }
 
-function sampleCursorPoint() {
+function getSelectedSourceBounds() {
 	const cursor = screen.getCursorScreenPoint();
 	const sourceDisplayId = Number(selectedSource?.display_id);
 	const sourceDisplay = Number.isFinite(sourceDisplayId)
 		? (screen.getAllDisplays().find((display) => display.id === sourceDisplayId) ?? null)
 		: null;
-	const display = sourceDisplay ?? screen.getDisplayNearestPoint(cursor);
-	const bounds = display.bounds;
-	const width = Math.max(1, bounds.width);
-	const height = Math.max(1, bounds.height);
-
-	const cx = clamp((cursor.x - bounds.x) / width, 0, 1);
-	const cy = clamp((cursor.y - bounds.y) / height, 0, 1);
-
-	cursorTelemetryBuffer.push({
-		timeMs: Math.max(0, Date.now() - cursorCaptureStartTimeMs),
-		cx,
-		cy,
-	});
+	return (sourceDisplay ?? screen.getDisplayNearestPoint(cursor)).bounds;
 }
 
 export function registerIpcHandlers(
 	createEditorWindow: () => void,
 	createSourceSelectorWindow: () => BrowserWindow,
-	createCountdownOverlayWindow: () => BrowserWindow,
 	getMainWindow: () => BrowserWindow | null,
 	getSourceSelectorWindow: () => BrowserWindow | null,
-	getCountdownOverlayWindow: () => BrowserWindow | null,
 	onRecordingStateChange?: (recording: boolean, sourceName: string) => void,
-	switchToHud?: () => void,
 ) {
-	const supportsWindowOpacity = process.platform !== "linux";
-	const countdownOverlayState = {
-		visible: false,
-		value: null as number | null,
-		activeRunId: null as number | null,
-		hideCommitId: 0,
-		hideCommitTimer: null as ReturnType<typeof setTimeout> | null,
-	};
-	const COUNTDOWN_OVERLAY_HIDE_DEBOUNCE_MS = 1200;
-
-	const clearCountdownOverlayHideCommit = () => {
-		if (countdownOverlayState.hideCommitTimer) {
-			clearTimeout(countdownOverlayState.hideCommitTimer);
-			countdownOverlayState.hideCommitTimer = null;
-		}
-	};
-
-	const commitCountdownOverlayHide = (win: BrowserWindow, hideCommitId: number) => {
-		if (win.isDestroyed()) {
-			return;
-		}
-
-		if (countdownOverlayState.visible || countdownOverlayState.hideCommitId !== hideCommitId) {
-			return;
-		}
-
-		win.hide();
-		if (supportsWindowOpacity) {
-			// Reset baseline opacity for the next show cycle.
-			win.setOpacity(1);
-		}
-	};
-
-	const flushCountdownOverlayState = (win: BrowserWindow) => {
-		if (win.isDestroyed()) {
-			return;
-		}
-
-		clearCountdownOverlayHideCommit();
-		win.webContents.send("countdown-overlay-value", countdownOverlayState.value);
-		if (!countdownOverlayState.visible) {
-			return;
-		}
-
-		if (win.isVisible()) {
-			if (supportsWindowOpacity) {
-				win.setOpacity(1);
-			}
-			return;
-		}
-
-		setTimeout(() => {
-			if (!win.isDestroyed() && countdownOverlayState.visible && !win.isVisible()) {
-				if (supportsWindowOpacity) {
-					win.setOpacity(0);
-				}
-				win.showInactive();
-
-				if (supportsWindowOpacity) {
-					setTimeout(() => {
-						if (!win.isDestroyed() && countdownOverlayState.visible && win.isVisible()) {
-							win.setOpacity(1);
-						}
-					}, 0);
-				}
-			}
-		}, 16);
-	};
-
-	ipcMain.handle("countdown-overlay-show", (_, value: number, runId: number) => {
-		countdownOverlayState.activeRunId = runId;
-		countdownOverlayState.visible = true;
-		countdownOverlayState.value = value;
-
-		const win = getCountdownOverlayWindow() ?? createCountdownOverlayWindow();
-		if (win.isDestroyed()) {
-			return;
-		}
-
-		if (win.webContents.isLoading()) {
-			win.webContents.once("did-finish-load", () => {
-				if (!win.isDestroyed()) {
-					flushCountdownOverlayState(win);
-				}
-			});
-		} else {
-			flushCountdownOverlayState(win);
-		}
-	});
-
-	ipcMain.handle("countdown-overlay-set-value", (_, value: number, runId: number) => {
-		if (countdownOverlayState.activeRunId !== runId || !countdownOverlayState.visible) {
-			return;
-		}
-
-		countdownOverlayState.value = value;
-
-		const win = getCountdownOverlayWindow();
-		if (!win || win.isDestroyed()) {
-			return;
-		}
-
-		if (win.webContents.isLoading()) {
-			return;
-		}
-
-		win.webContents.send("countdown-overlay-value", value);
-	});
-
-	ipcMain.handle("countdown-overlay-hide", (_, runId: number) => {
-		if (countdownOverlayState.activeRunId !== runId) {
-			return;
-		}
-
-		countdownOverlayState.visible = false;
-		countdownOverlayState.hideCommitId += 1;
-		const hideCommitId = countdownOverlayState.hideCommitId;
-		clearCountdownOverlayHideCommit();
-
-		const win = getCountdownOverlayWindow();
-		if (!win || win.isDestroyed()) {
-			countdownOverlayState.value = null;
-			return;
-		}
-
-		if (supportsWindowOpacity) {
-			// Hide visually immediately to avoid hide/show compositor flashes on rapid restart.
-			win.setOpacity(0);
-		}
-
-		countdownOverlayState.value = null;
-		if (!win.webContents.isLoading()) {
-			win.webContents.send("countdown-overlay-value", countdownOverlayState.value);
-		}
-
-		if (!supportsWindowOpacity) {
-			win.hide();
-			return;
-		}
-
-		countdownOverlayState.hideCommitTimer = setTimeout(() => {
-			countdownOverlayState.hideCommitTimer = null;
-			commitCountdownOverlayHide(win, hideCommitId);
-		}, COUNTDOWN_OVERLAY_HIDE_DEBOUNCE_MS);
-	});
-
-	ipcMain.handle("switch-to-hud", () => {
-		if (switchToHud) switchToHud();
-	});
-	ipcMain.handle("start-new-recording", () => {
-		try {
-			setCurrentRecordingSessionState(null);
-			if (switchToHud) {
-				switchToHud();
-			}
-			return { success: true };
-		} catch (error) {
-			console.error("Failed to start new recording:", error);
-			return { success: false, error: String(error) };
-		}
-	});
-
 	ipcMain.handle("get-sources", async (_, opts) => {
-		const ownWindowSourceIds = new Set(
-			BrowserWindow.getAllWindows()
-				.map((win) => {
-					try {
-						return win.getMediaSourceId();
-					} catch {
-						return null;
-					}
-				})
-				.filter((id): id is string => Boolean(id)),
-		);
 		const sources = await desktopCapturer.getSources(opts);
-		return sources
-			.filter((source) => !ownWindowSourceIds.has(source.id))
-			.map((source) => ({
-				id: source.id,
-				name: source.name,
-				display_id: source.display_id,
-				thumbnail: source.thumbnail ? source.thumbnail.toDataURL() : null,
-				appIcon: source.appIcon ? source.appIcon.toDataURL() : null,
-			}));
+		return sources.map((source) => ({
+			id: source.id,
+			name: source.name,
+			display_id: source.display_id,
+			thumbnail: source.thumbnail ? source.thumbnail.toDataURL() : null,
+			appIcon: source.appIcon ? source.appIcon.toDataURL() : null,
+		}));
 	});
 
 	ipcMain.handle("select-source", (_, source: SelectedSource) => {
@@ -717,22 +457,6 @@ export function registerIpcHandlers(
 		}
 	});
 
-	// macOS Accessibility prompt for global click capture. First call shows the
-	// system dialog; the user has to toggle the app in System Settings (no
-	// programmatic grant exists for Accessibility).
-	ipcMain.handle("request-accessibility-access", () => {
-		if (process.platform !== "darwin") {
-			return { success: true, granted: true };
-		}
-		try {
-			const granted = systemPreferences.isTrustedAccessibilityClient(true);
-			return { success: true, granted };
-		} catch (error) {
-			console.error("Failed to request accessibility access:", error);
-			return { success: false, granted: false, error: String(error) };
-		}
-	});
-
 	ipcMain.handle("open-source-selector", () => {
 		const sourceSelectorWin = getSourceSelectorWindow();
 		if (sourceSelectorWin) {
@@ -752,7 +476,25 @@ export function registerIpcHandlers(
 
 	ipcMain.handle("store-recorded-session", async (_, payload: StoreRecordedSessionInput) => {
 		try {
-			return await storeRecordedSessionFiles(payload);
+			const videoPath = path.join(RECORDINGS_DIR, fileName);
+			await fs.writeFile(videoPath, Buffer.from(videoData));
+			currentProjectPath = null;
+
+			const telemetryPath = `${videoPath}.cursor.json`;
+			if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
+				await fs.writeFile(
+					telemetryPath,
+					JSON.stringify(pendingCursorRecordingData, null, 2),
+					"utf-8",
+				);
+			}
+			pendingCursorRecordingData = null;
+
+			return {
+				success: true,
+				path: videoPath,
+				message: "Video stored successfully",
+			};
 		} catch (error) {
 			console.error("Failed to store recording session:", error);
 			return {
@@ -794,24 +536,7 @@ export function registerIpcHandlers(
 				return { success: false, message: "No recorded video found" };
 			}
 
-			// Sort by most recently modified to reliably get the latest recording.
-			// Lexicographic sort is unreliable (e.g. recording-9.webm > recording-10.webm).
-			let latestVideo: string | null = null;
-			let latestMtimeMs = 0;
-			for (const file of videoFiles) {
-				try {
-					const stat = await fs.stat(path.join(RECORDINGS_DIR, file));
-					if (stat.mtimeMs > latestMtimeMs) {
-						latestMtimeMs = stat.mtimeMs;
-						latestVideo = file;
-					}
-				} catch {
-					// Skip inaccessible files.
-				}
-			}
-			if (!latestVideo) {
-				return { success: false, message: "No recorded video found" };
-			}
+			const latestVideo = videoFiles.sort().reverse()[0];
 			const videoPath = path.join(RECORDINGS_DIR, latestVideo);
 
 			return { success: true, path: videoPath };
@@ -821,54 +546,38 @@ export function registerIpcHandlers(
 		}
 	});
 
-	ipcMain.handle("read-binary-file", async (_, inputPath: string) => {
-		try {
-			const normalizedPath = normalizeVideoSourcePath(inputPath);
-			if (!normalizedPath) {
-				return { success: false, message: "Invalid file path" };
-			}
-
-			if (!isPathAllowed(normalizedPath)) {
-				console.warn(
-					"[read-binary-file] Rejected path outside allowed directories:",
-					normalizedPath,
-				);
-				return { success: false, message: "Access denied: path outside allowed directories" };
+	ipcMain.handle("set-recording-state", async (_, recording: boolean) => {
+		if (recording) {
+			if (cursorRecordingSession) {
+				pendingCursorRecordingData = await cursorRecordingSession.stop();
+				cursorRecordingSession = null;
 			}
 
-			const data = await fs.readFile(normalizedPath);
-			return {
-				success: true,
-				data: data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength),
-				path: normalizedPath,
-			};
-		} catch (error) {
-			console.error("Failed to read binary file:", error);
-			return {
-				success: false,
-				message: "Failed to read binary file",
-				error: String(error),
-			};
-		}
-	});
+			pendingCursorRecordingData = null;
+			cursorRecordingSession = createCursorRecordingSession({
+				getDisplayBounds: getSelectedSourceBounds,
+				maxSamples: MAX_CURSOR_SAMPLES,
+				platform: process.platform,
+				sampleIntervalMs: CURSOR_SAMPLE_INTERVAL_MS,
+			});
 
-	ipcMain.handle("set-recording-state", (_, recording: boolean, recordingId?: number) => {
-		if (recording) {
-			stopCursorCapture();
-			// The renderer is the source of truth for the recording id (it
-			// uses the same id as the saved fileName). Fall back to a
-			// timestamp only if the renderer didn't supply one, so the
-			// buffer always has a stable key per session.
-			const id = typeof recordingId === "number" ? recordingId : Date.now();
-			cursorTelemetryBuffer.startSession(id);
-			cursorCaptureStartTimeMs = Date.now();
-			cursorClickTimestampsMs = [];
-			startClickCapture();
-			sampleCursorPoint();
-			cursorCaptureInterval = setInterval(sampleCursorPoint, CURSOR_SAMPLE_INTERVAL_MS);
+			try {
+				await cursorRecordingSession.start();
+			} catch (error) {
+				console.error("Failed to start cursor recording session:", error);
+				cursorRecordingSession = null;
+			}
 		} else {
-			stopCursorCapture();
-			cursorTelemetryBuffer.endSession();
+			if (cursorRecordingSession) {
+				try {
+					pendingCursorRecordingData = await cursorRecordingSession.stop();
+				} catch (error) {
+					console.error("Failed to stop cursor recording session:", error);
+					pendingCursorRecordingData = null;
+				} finally {
+					cursorRecordingSession = null;
+				}
+			}
 		}
 
 		const source = selectedSource || { name: "Screen" };
@@ -877,10 +586,6 @@ export function registerIpcHandlers(
 		}
 	});
 
-	ipcMain.handle("discard-cursor-telemetry", (_, recordingId: number) => {
-		cursorTelemetryBuffer.discardBatch(recordingId);
-	});
-
 	ipcMain.handle("get-cursor-telemetry", async (_, videoPath?: string) => {
 		const targetVideoPath = normalizeVideoSourcePath(
 			videoPath ?? currentRecordingSession?.screenVideoPath,
@@ -889,85 +594,12 @@ export function registerIpcHandlers(
 			return { success: true, samples: [] };
 		}
 
-		if (!isPathAllowed(targetVideoPath)) {
-			console.warn(
-				"[get-cursor-telemetry] Rejected path outside allowed directories:",
-				targetVideoPath,
-			);
-			return { success: true, samples: [] };
-		}
-
-		const telemetryPath = `${targetVideoPath}.cursor.json`;
-		try {
-			const content = await fs.readFile(telemetryPath, "utf-8");
-			const parsed = JSON.parse(content);
-			const rawSamples = Array.isArray(parsed)
-				? parsed
-				: Array.isArray(parsed?.samples)
-					? parsed.samples
-					: [];
-
-			const samples: CursorTelemetryPoint[] = rawSamples
-				.filter((sample: unknown) => Boolean(sample && typeof sample === "object"))
-				.map((sample: unknown) => {
-					const point = sample as Partial<CursorTelemetryPoint>;
-					return {
-						timeMs:
-							typeof point.timeMs === "number" && Number.isFinite(point.timeMs)
-								? Math.max(0, point.timeMs)
-								: 0,
-						cx:
-							typeof point.cx === "number" && Number.isFinite(point.cx)
-								? clamp(point.cx, 0, 1)
-								: 0.5,
-						cy:
-							typeof point.cy === "number" && Number.isFinite(point.cy)
-								? clamp(point.cy, 0, 1)
-								: 0.5,
-					};
-				})
-				.sort((a: CursorTelemetryPoint, b: CursorTelemetryPoint) => a.timeMs - b.timeMs);
-
-			const rawClicks = Array.isArray(parsed?.clicks) ? parsed.clicks : [];
-			const clicks: number[] = rawClicks
-				.map((value: unknown) =>
-					typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : null,
-				)
-				.filter((v: number | null): v is number => v !== null)
-				.sort((a: number, b: number) => a - b);
-
-			return { success: true, samples, clicks };
-		} catch (error) {
-			const nodeError = error as NodeJS.ErrnoException;
-			if (nodeError.code === "ENOENT") {
-				return { success: true, samples: [], clicks: [] };
-			}
-			console.error("Failed to load cursor telemetry:", error);
-			return {
-				success: false,
-				message: "Failed to load cursor telemetry",
-				error: String(error),
-				samples: [],
-				clicks: [],
-			};
-		}
+		return readCursorTelemetryFile(targetVideoPath);
 	});
 
 	ipcMain.handle("open-external-url", async (_, url: string) => {
 		try {
-			const ALLOWED_SCHEMES = ["http:", "https:", "mailto:"];
-			let parsed: URL;
-			try {
-				parsed = new URL(url);
-			} catch {
-				return { success: false, error: "Invalid URL" };
-			}
-
-			if (!ALLOWED_SCHEMES.includes(parsed.protocol)) {
-				return { success: false, error: `Unsupported URL scheme: ${parsed.protocol}` };
-			}
-
-			await shell.openExternal(parsed.toString());
+			await shell.openExternal(url);
 			return { success: true };
 		} catch (error) {
 			console.error("Failed to open URL:", error);
@@ -975,15 +607,10 @@ export function registerIpcHandlers(
 		}
 	});
 
-	/**
-	 * Handles saving an exported video file.
-	 * Shows a save dialog, normalizes the file path for the current OS,
-	 * ensures the directory exists, and writes the video data.
-	 * @param _ - Unused event parameter.
-	 * @param videoData - The exported video as an ArrayBuffer.
-	 * @param fileName - Suggested filename for the save dialog.
-	 * @returns Object with success status, optional file path, and error details.
-	 */
+	// Return base path for assets so renderer can resolve file:// paths in production
+	ipcMain.handle("get-asset-base-path", () => {
+		return resolveAssetBasePath();
+	});
 
 	ipcMain.handle("save-exported-video", async (_, videoData: ArrayBuffer, fileName: string) => {
 		try {
@@ -1014,18 +641,11 @@ export function registerIpcHandlers(
 				};
 			}
 
-			// --- FIX: Normalize the path for Windows compatibility ---
-			const normalizedPath = path.normalize(result.filePath);
-
-			// Ensure the parent directory exists (Windows may fail if the folder is missing)
-			await fs.mkdir(path.dirname(normalizedPath), { recursive: true });
-			// --- END FIX ---
-
-			await fs.writeFile(normalizedPath, Buffer.from(videoData));
+			await fs.writeFile(result.filePath, Buffer.from(videoData));
 
 			return {
 				success: true,
-				path: normalizedPath,
+				path: result.filePath,
 				message: "Video exported successfully",
 			};
 		} catch (error) {
@@ -1037,6 +657,7 @@ export function registerIpcHandlers(
 			};
 		}
 	});
+
 	ipcMain.handle("open-video-file-picker", async () => {
 		try {
 			const dialogOptions = buildDialogOptions(
@@ -1060,17 +681,10 @@ export function registerIpcHandlers(
 				return { success: false, canceled: true };
 			}
 
-			const approvedPath = await approveReadableVideoPath(result.filePaths[0]);
-			if (!approvedPath) {
-				return {
-					success: false,
-					message: "Selected file is not a supported video",
-				};
-			}
 			currentProjectPath = null;
 			return {
 				success: true,
-				path: approvedPath,
+				path: result.filePaths[0],
 			};
 		} catch (error) {
 			console.error("Failed to open file picker:", error);
@@ -1109,75 +723,87 @@ export function registerIpcHandlers(
 	ipcMain.handle(
 		"save-project-file",
 		async (_, projectData: unknown, suggestedName?: string, existingProjectPath?: string) => {
-			try {
-				const trustedExistingProjectPath = isTrustedProjectPath(existingProjectPath)
-					? existingProjectPath
-					: null;
-
-				if (trustedExistingProjectPath) {
-					await fs.writeFile(
-						trustedExistingProjectPath,
-						JSON.stringify(projectData, null, 2),
-						"utf-8",
-					);
-					currentProjectPath = trustedExistingProjectPath;
-					return {
-						success: true,
-						path: trustedExistingProjectPath,
-						message: "Project saved successfully",
-					};
-				}
+			return saveProjectFile(projectData, suggestedName, existingProjectPath);
+		},
+	);
 
-				const safeName = (suggestedName || `project-${Date.now()}`).replace(/[^a-zA-Z0-9-_]/g, "_");
-				const defaultName = safeName.endsWith(`.${PROJECT_FILE_EXTENSION}`)
-					? safeName
-					: `${safeName}.${PROJECT_FILE_EXTENSION}`;
-
-				const dialogOptions = buildDialogOptions(
-					{
-						title: mainT("dialogs", "fileDialogs.saveProject"),
-						defaultPath: path.join(RECORDINGS_DIR, defaultName),
-						filters: [
-							{
-								name: mainT("dialogs", "fileDialogs.openscreenProject"),
-								extensions: [PROJECT_FILE_EXTENSION],
-							},
-							{ name: "JSON", extensions: ["json"] },
-						],
-						properties: ["createDirectory", "showOverwriteConfirmation"],
-					},
-					getMainWindow(),
+	async function saveProjectFile(
+		projectData: unknown,
+		suggestedName?: string,
+		existingProjectPath?: string,
+	): Promise<ProjectFileResult> {
+		try {
+			const trustedExistingProjectPath = isTrustedProjectPath(existingProjectPath)
+				? existingProjectPath
+				: null;
+
+			if (trustedExistingProjectPath) {
+				await fs.writeFile(
+					trustedExistingProjectPath,
+					JSON.stringify(projectData, null, 2),
+					"utf-8",
 				);
-				const result = await dialog.showSaveDialog(dialogOptions);
-
-				if (result.canceled || !result.filePath) {
-					return {
-						success: false,
-						canceled: true,
-						message: "Save project canceled",
-					};
-				}
-
-				await fs.writeFile(result.filePath, JSON.stringify(projectData, null, 2), "utf-8");
-				currentProjectPath = result.filePath;
-
+				currentProjectPath = trustedExistingProjectPath;
 				return {
 					success: true,
-					path: result.filePath,
+					path: trustedExistingProjectPath,
 					message: "Project saved successfully",
 				};
-			} catch (error) {
-				console.error("Failed to save project file:", error);
+			}
+
+			const safeName = (suggestedName || `project-${Date.now()}`).replace(/[^a-zA-Z0-9-_]/g, "_");
+			const defaultName = safeName.endsWith(`.${PROJECT_FILE_EXTENSION}`)
+				? safeName
+				: `${safeName}.${PROJECT_FILE_EXTENSION}`;
+
+			const dialogOptions = buildDialogOptions(
+				{
+					title: mainT("dialogs", "fileDialogs.saveProject"),
+					defaultPath: path.join(RECORDINGS_DIR, defaultName),
+					filters: [
+						{
+							name: mainT("dialogs", "fileDialogs.openscreenProject"),
+							extensions: [PROJECT_FILE_EXTENSION],
+						},
+						{ name: "JSON", extensions: ["json"] },
+					],
+					properties: ["createDirectory", "showOverwriteConfirmation"],
+				},
+				getMainWindow(),
+			);
+			const result = await dialog.showSaveDialog(dialogOptions);
+
+			if (result.canceled || !result.filePath) {
 				return {
 					success: false,
-					message: "Failed to save project file",
-					error: String(error),
+					canceled: true,
+					message: "Save project canceled",
 				};
 			}
-		},
-	);
+
+			await fs.writeFile(result.filePath, JSON.stringify(projectData, null, 2), "utf-8");
+			currentProjectPath = result.filePath;
+
+			return {
+				success: true,
+				path: result.filePath,
+				message: "Project saved successfully",
+			};
+		} catch (error) {
+			console.error("Failed to save project file:", error);
+			return {
+				success: false,
+				message: "Failed to save project file",
+				error: String(error),
+			};
+		}
+	}
 
 	ipcMain.handle("load-project-file", async () => {
+		return loadProjectFile();
+	});
+
+	async function loadProjectFile(): Promise<ProjectFileResult> {
 		try {
 			const dialogOptions = buildDialogOptions(
 				{
@@ -1204,9 +830,19 @@ export function registerIpcHandlers(
 			const filePath = result.filePaths[0];
 			const content = await fs.readFile(filePath, "utf-8");
 			const project = JSON.parse(content);
-			const session = await getApprovedProjectSession(project, filePath);
 			currentProjectPath = filePath;
-			setCurrentRecordingSessionState(session);
+			if (project && typeof project === "object") {
+				const rawProject = project as { media?: unknown; videoPath?: unknown };
+				const media =
+					normalizeProjectMedia(rawProject.media) ??
+					(typeof rawProject.videoPath === "string"
+						? {
+								screenVideoPath:
+									normalizeVideoSourcePath(rawProject.videoPath) ?? rawProject.videoPath,
+							}
+						: null);
+				setCurrentRecordingSessionState(media ? { ...media, createdAt: Date.now() } : null);
+			}
 
 			return {
 				success: true,
@@ -1221,9 +857,13 @@ export function registerIpcHandlers(
 				error: String(error),
 			};
 		}
-	});
+	}
 
 	ipcMain.handle("load-current-project-file", async () => {
+		return loadCurrentProjectFile();
+	});
+
+	async function loadCurrentProjectFile(): Promise<ProjectFileResult> {
 		try {
 			if (!currentProjectPath) {
 				return { success: false, message: "No active project" };
@@ -1231,8 +871,18 @@ export function registerIpcHandlers(
 
 			const content = await fs.readFile(currentProjectPath, "utf-8");
 			const project = JSON.parse(content);
-			const session = await getApprovedProjectSession(project, currentProjectPath);
-			setCurrentRecordingSessionState(session);
+			if (project && typeof project === "object") {
+				const rawProject = project as { media?: unknown; videoPath?: unknown };
+				const media =
+					normalizeProjectMedia(rawProject.media) ??
+					(typeof rawProject.videoPath === "string"
+						? {
+								screenVideoPath:
+									normalizeVideoSourcePath(rawProject.videoPath) ?? rawProject.videoPath,
+							}
+						: null);
+				setCurrentRecordingSessionState(media ? { ...media, createdAt: Date.now() } : null);
+			}
 			return {
 				success: true,
 				path: currentProjectPath,
@@ -1246,55 +896,35 @@ export function registerIpcHandlers(
 				error: String(error),
 			};
 		}
-	});
-	ipcMain.handle("set-current-recording-session", (_, session: RecordingSession | null) => {
-		const normalized = normalizeRecordingSession(session);
-		setCurrentRecordingSessionState(normalized);
-		currentProjectPath = null;
-		return { success: true, session: normalized ?? undefined };
-	});
+	}
 
-	ipcMain.handle("get-current-recording-session", () => {
-		return currentRecordingSession
-			? { success: true, session: currentRecordingSession }
-			: { success: false };
+	ipcMain.handle("set-current-video-path", (_, path: string) => {
+		return setCurrentVideoPath(path);
 	});
 
-	ipcMain.handle("set-current-video-path", async (_, path: string) => {
-		const normalizedPath = normalizeVideoSourcePath(path);
-		if (!normalizedPath || !isPathAllowed(normalizedPath)) {
-			return { success: false, message: "Video path has not been approved" };
-		}
-
-		const restoredSession = await loadRecordedSessionForVideoPath(normalizedPath);
-		if (restoredSession) {
-			// Approve all media paths from the restored session so they can be read later
-			approveFilePath(restoredSession.screenVideoPath);
-			if (restoredSession.webcamVideoPath) {
-				approveFilePath(restoredSession.webcamVideoPath);
-			}
-			setCurrentRecordingSessionState(restoredSession);
-		} else {
-			setCurrentRecordingSessionState({
-				screenVideoPath: normalizedPath,
-				createdAt: Date.now(),
-			});
-		}
+	function setCurrentVideoPath(path: string): ProjectPathResult {
+		currentVideoPath = normalizeVideoSourcePath(path) ?? path;
 		currentProjectPath = null;
 		return { success: true };
-	});
+	}
 
 	ipcMain.handle("get-current-video-path", () => {
-		return currentRecordingSession?.screenVideoPath
-			? { success: true, path: currentRecordingSession.screenVideoPath }
-			: { success: false };
+		return getCurrentVideoPathResult();
 	});
 
+	function getCurrentVideoPathResult(): ProjectPathResult {
+		return currentVideoPath ? { success: true, path: currentVideoPath } : { success: false };
+	}
+
 	ipcMain.handle("clear-current-video-path", () => {
-		setCurrentRecordingSessionState(null);
-		return { success: true };
+		return clearCurrentVideoPath();
 	});
 
+	function clearCurrentVideoPath(): ProjectPathResult {
+		currentVideoPath = null;
+		return { success: true };
+	}
+
 	ipcMain.handle("get-platform", () => {
 		return process.platform;
 	});
@@ -1317,4 +947,21 @@ export function registerIpcHandlers(
 			return { success: false, error: String(error) };
 		}
 	});
+
+	registerNativeBridgeHandlers({
+		getPlatform: () => process.platform,
+		getCurrentProjectPath: () => currentProjectPath,
+		getCurrentVideoPath: () => currentVideoPath,
+		saveProjectFile,
+		loadProjectFile,
+		loadCurrentProjectFile,
+		setCurrentVideoPath,
+		getCurrentVideoPathResult,
+		clearCurrentVideoPath,
+		resolveAssetBasePath,
+		resolveVideoPath: (videoPath?: string | null) =>
+			normalizeVideoSourcePath(videoPath ?? currentVideoPath),
+		loadCursorRecordingData: readCursorRecordingFile,
+		loadCursorTelemetry: readCursorTelemetryFile,
+	});
 }
diff --git a/electron/native-bridge/cursor/recording/factory.ts b/electron/native-bridge/cursor/recording/factory.ts
new file mode 100644
index 000000000..fe92991fd
--- /dev/null
+++ b/electron/native-bridge/cursor/recording/factory.ts
@@ -0,0 +1,29 @@
+import type { Rectangle } from "electron";
+import type { CursorRecordingSession } from "./session";
+import { TelemetryRecordingSession } from "./telemetryRecordingSession";
+import { WindowsNativeRecordingSession } from "./windowsNativeRecordingSession";
+
+interface CreateCursorRecordingSessionOptions {
+	getDisplayBounds: () => Rectangle | null;
+	maxSamples: number;
+	platform: NodeJS.Platform;
+	sampleIntervalMs: number;
+}
+
+export function createCursorRecordingSession(
+	options: CreateCursorRecordingSessionOptions,
+): CursorRecordingSession {
+	if (options.platform === "win32") {
+		return new WindowsNativeRecordingSession({
+			getDisplayBounds: options.getDisplayBounds,
+			maxSamples: options.maxSamples,
+			sampleIntervalMs: options.sampleIntervalMs,
+		});
+	}
+
+	return new TelemetryRecordingSession({
+		getDisplayBounds: options.getDisplayBounds,
+		maxSamples: options.maxSamples,
+		sampleIntervalMs: options.sampleIntervalMs,
+	});
+}
diff --git a/electron/native-bridge/cursor/recording/session.ts b/electron/native-bridge/cursor/recording/session.ts
new file mode 100644
index 000000000..9cebe9f4c
--- /dev/null
+++ b/electron/native-bridge/cursor/recording/session.ts
@@ -0,0 +1,6 @@
+import type { CursorRecordingData } from "../../../../src/native/contracts";
+
+export interface CursorRecordingSession {
+	start(): Promise<void>;
+	stop(): Promise<CursorRecordingData>;
+}
diff --git a/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts b/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts
new file mode 100644
index 000000000..dd42871bd
--- /dev/null
+++ b/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts
@@ -0,0 +1,62 @@
+import { type Rectangle, screen } from "electron";
+import type { CursorRecordingData, CursorRecordingSample } from "../../../../src/native/contracts";
+import type { CursorRecordingSession } from "./session";
+
+interface TelemetryRecordingSessionOptions {
+	getDisplayBounds: () => Rectangle | null;
+	maxSamples: number;
+	sampleIntervalMs: number;
+}
+
+function clamp(value: number, min: number, max: number) {
+	return Math.min(max, Math.max(min, value));
+}
+
+export class TelemetryRecordingSession implements CursorRecordingSession {
+	private samples: CursorRecordingSample[] = [];
+	private interval: NodeJS.Timeout | null = null;
+	private startTimeMs = 0;
+
+	constructor(private readonly options: TelemetryRecordingSessionOptions) {}
+
+	async start(): Promise<void> {
+		this.samples = [];
+		this.startTimeMs = Date.now();
+		this.captureSample();
+		this.interval = setInterval(() => {
+			this.captureSample();
+		}, this.options.sampleIntervalMs);
+	}
+
+	async stop(): Promise<CursorRecordingData> {
+		if (this.interval) {
+			clearInterval(this.interval);
+			this.interval = null;
+		}
+
+		return {
+			version: 2,
+			provider: "none",
+			samples: this.samples,
+			assets: [],
+		};
+	}
+
+	private captureSample() {
+		const cursor = screen.getCursorScreenPoint();
+		const display = this.options.getDisplayBounds() ?? screen.getDisplayNearestPoint(cursor).bounds;
+		const width = Math.max(1, display.width);
+		const height = Math.max(1, display.height);
+
+		this.samples.push({
+			timeMs: Math.max(0, Date.now() - this.startTimeMs),
+			cx: clamp((cursor.x - display.x) / width, 0, 1),
+			cy: clamp((cursor.y - display.y) / height, 0, 1),
+			visible: true,
+		});
+
+		if (this.samples.length > this.options.maxSamples) {
+			this.samples.shift();
+		}
+	}
+}
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
new file mode 100644
index 000000000..a0540ed89
--- /dev/null
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -0,0 +1,326 @@
+import { type ChildProcessByStdio, spawn } from "node:child_process";
+import type { Readable } from "node:stream";
+import { type Rectangle, screen } from "electron";
+import type {
+	CursorRecordingData,
+	CursorRecordingSample,
+	NativeCursorAsset,
+} from "../../../../src/native/contracts";
+import type { CursorRecordingSession } from "./session";
+
+interface WindowsCursorSampleEvent {
+	type: "sample";
+	timestampMs: number;
+	x: number;
+	y: number;
+	visible: boolean;
+	handle: string | null;
+	asset?: WindowsCursorAssetPayload;
+}
+
+interface WindowsCursorReadyEvent {
+	type: "ready";
+	timestampMs: number;
+}
+
+interface WindowsCursorErrorEvent {
+	type: "error";
+	timestampMs: number;
+	message: string;
+}
+
+interface WindowsCursorAssetPayload {
+	id: string;
+	imageDataUrl: string;
+	width: number;
+	height: number;
+	hotspotX: number;
+	hotspotY: number;
+}
+
+type WindowsCursorEvent =
+	| WindowsCursorSampleEvent
+	| WindowsCursorReadyEvent
+	| WindowsCursorErrorEvent;
+
+interface WindowsNativeRecordingSessionOptions {
+	getDisplayBounds: () => Rectangle | null;
+	maxSamples: number;
+	sampleIntervalMs: number;
+}
+
+function clamp(value: number, min: number, max: number) {
+	return Math.min(max, Math.max(min, value));
+}
+
+function buildPowerShellCommand(sampleIntervalMs: number) {
+	const script = String.raw`
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Drawing
+
+$source = @"
+using System;
+using System.Runtime.InteropServices;
+
+public static class OpenScreenCursorInterop {
+    [StructLayout(LayoutKind.Sequential)]
+    public struct POINT {
+        public int X;
+        public int Y;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct CURSORINFO {
+        public int cbSize;
+        public int flags;
+        public IntPtr hCursor;
+        public POINT ptScreenPos;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ICONINFO {
+        [MarshalAs(UnmanagedType.Bool)]
+        public bool fIcon;
+        public int xHotspot;
+        public int yHotspot;
+        public IntPtr hbmMask;
+        public IntPtr hbmColor;
+    }
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool GetCursorInfo(ref CURSORINFO pci);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr CopyIcon(IntPtr hIcon);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DestroyIcon(IntPtr hIcon);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool GetIconInfo(IntPtr hIcon, out ICONINFO piconinfo);
+
+    [DllImport("gdi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DeleteObject(IntPtr hObject);
+}
+"@
+
+Add-Type -TypeDefinition $source
+
+function Write-JsonLine($payload) {
+    [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
+}
+
+function Get-CursorAsset($cursorHandle, $cursorId) {
+    $copiedHandle = [OpenScreenCursorInterop]::CopyIcon($cursorHandle)
+    if ($copiedHandle -eq [IntPtr]::Zero) {
+        return $null
+    }
+
+    $iconInfo = New-Object OpenScreenCursorInterop+ICONINFO
+    $hasIconInfo = [OpenScreenCursorInterop]::GetIconInfo($copiedHandle, [ref]$iconInfo)
+
+    try {
+        $icon = [System.Drawing.Icon]::FromHandle($copiedHandle)
+        $bitmap = New-Object System.Drawing.Bitmap $icon.Width, $icon.Height, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
+        $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+        $memoryStream = New-Object System.IO.MemoryStream
+
+        try {
+            $graphics.Clear([System.Drawing.Color]::Transparent)
+            $graphics.DrawIcon($icon, 0, 0)
+            $bitmap.Save($memoryStream, [System.Drawing.Imaging.ImageFormat]::Png)
+            $base64 = [System.Convert]::ToBase64String($memoryStream.ToArray())
+
+            return @{
+                id = $cursorId
+                imageDataUrl = "data:image/png;base64,$base64"
+                width = $bitmap.Width
+                height = $bitmap.Height
+                hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
+                hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+            }
+        }
+        finally {
+            $memoryStream.Dispose()
+            $graphics.Dispose()
+            $bitmap.Dispose()
+            $icon.Dispose()
+        }
+    }
+    finally {
+        if ($hasIconInfo) {
+            if ($iconInfo.hbmMask -ne [IntPtr]::Zero) {
+                [OpenScreenCursorInterop]::DeleteObject($iconInfo.hbmMask) | Out-Null
+            }
+            if ($iconInfo.hbmColor -ne [IntPtr]::Zero) {
+                [OpenScreenCursorInterop]::DeleteObject($iconInfo.hbmColor) | Out-Null
+            }
+        }
+        [OpenScreenCursorInterop]::DestroyIcon($copiedHandle) | Out-Null
+    }
+}
+
+Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
+
+$lastCursorId = $null
+while ($true) {
+    $cursorInfo = New-Object OpenScreenCursorInterop+CURSORINFO
+    $cursorInfo.cbSize = [Runtime.InteropServices.Marshal]::SizeOf([type][OpenScreenCursorInterop+CURSORINFO])
+
+    if (-not [OpenScreenCursorInterop]::GetCursorInfo([ref]$cursorInfo)) {
+        Write-JsonLine @{ type = 'error'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds(); message = 'GetCursorInfo failed' }
+        Start-Sleep -Milliseconds ${sampleIntervalMs}
+        continue
+    }
+
+    $visible = ($cursorInfo.flags -band 1) -ne 0
+    $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
+    $asset = $null
+
+    if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
+        $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
+        $lastCursorId = $cursorId
+    }
+
+    Write-JsonLine @{
+        type = 'sample'
+        timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()
+        x = $cursorInfo.ptScreenPos.X
+        y = $cursorInfo.ptScreenPos.Y
+        visible = $visible
+        handle = $cursorId
+        asset = $asset
+    }
+
+    Start-Sleep -Milliseconds ${sampleIntervalMs}
+}
+`;
+
+	return Buffer.from(script, "utf16le").toString("base64");
+}
+
+export class WindowsNativeRecordingSession implements CursorRecordingSession {
+	private assets = new Map<string, NativeCursorAsset>();
+	private samples: CursorRecordingSample[] = [];
+	private process: ChildProcessByStdio<null, Readable, Readable> | null = null;
+	private lineBuffer = "";
+	private startTimeMs = 0;
+
+	constructor(private readonly options: WindowsNativeRecordingSessionOptions) {}
+
+	async start(): Promise<void> {
+		this.assets.clear();
+		this.samples = [];
+		this.lineBuffer = "";
+		this.startTimeMs = Date.now();
+
+		const encodedCommand = buildPowerShellCommand(this.options.sampleIntervalMs);
+		const child = spawn(
+			"powershell.exe",
+			[
+				"-NoLogo",
+				"-NoProfile",
+				"-NonInteractive",
+				"-ExecutionPolicy",
+				"Bypass",
+				"-EncodedCommand",
+				encodedCommand,
+			],
+			{
+				stdio: ["ignore", "pipe", "pipe"],
+				windowsHide: true,
+			},
+		);
+
+		this.process = child;
+		child.stdout.setEncoding("utf8");
+		child.stdout.on("data", (chunk: string) => {
+			this.handleStdoutChunk(chunk);
+		});
+		child.stderr.setEncoding("utf8");
+		child.stderr.on("data", (chunk: string) => {
+			console.error("[cursor-native]", chunk.trim());
+		});
+	}
+
+	async stop(): Promise<CursorRecordingData> {
+		const child = this.process;
+		this.process = null;
+
+		if (child && !child.killed) {
+			child.kill();
+		}
+
+		return {
+			version: 2,
+			provider: this.assets.size > 0 ? "native" : "none",
+			samples: this.samples,
+			assets: [...this.assets.values()],
+		};
+	}
+
+	private handleStdoutChunk(chunk: string) {
+		this.lineBuffer += chunk;
+		const lines = this.lineBuffer.split(/\r?\n/);
+		this.lineBuffer = lines.pop() ?? "";
+
+		for (const line of lines) {
+			const trimmedLine = line.trim();
+			if (!trimmedLine) {
+				continue;
+			}
+
+			try {
+				const payload = JSON.parse(trimmedLine) as WindowsCursorEvent;
+				this.handleEvent(payload);
+			} catch (error) {
+				console.error("Failed to parse Windows cursor helper output:", error, trimmedLine);
+			}
+		}
+	}
+
+	private handleEvent(payload: WindowsCursorEvent) {
+		if (payload.type === "error") {
+			console.error("Windows cursor helper error:", payload.message);
+			return;
+		}
+
+		if (payload.type === "ready") {
+			return;
+		}
+
+		if (payload.asset?.id && !this.assets.has(payload.asset.id)) {
+			const assetDisplay = screen.getDisplayNearestPoint({ x: payload.x, y: payload.y });
+			this.assets.set(payload.asset.id, {
+				id: payload.asset.id,
+				platform: "win32",
+				imageDataUrl: payload.asset.imageDataUrl,
+				width: payload.asset.width,
+				height: payload.asset.height,
+				hotspotX: payload.asset.hotspotX,
+				hotspotY: payload.asset.hotspotY,
+				scaleFactor: assetDisplay.scaleFactor,
+			});
+		}
+
+		const bounds = this.options.getDisplayBounds() ?? screen.getPrimaryDisplay().bounds;
+		const width = Math.max(1, bounds.width);
+		const height = Math.max(1, bounds.height);
+
+		this.samples.push({
+			timeMs: Math.max(0, payload.timestampMs - this.startTimeMs),
+			cx: clamp((payload.x - bounds.x) / width, 0, 1),
+			cy: clamp((payload.y - bounds.y) / height, 0, 1),
+			assetId: payload.handle,
+			visible: payload.visible,
+		});
+
+		if (this.samples.length > this.options.maxSamples) {
+			this.samples.shift();
+		}
+	}
+}
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index cf7361291..77378fbe4 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -38,6 +38,7 @@ import {
 	getNativeAspectRatioValue,
 	isPortraitAspectRatio,
 } from "@/utils/aspectRatioUtils";
+import { nativeBridgeClient, useCursorRecordingData, useCursorTelemetry } from "@/native";
 import { ExportDialog } from "./ExportDialog";
 import PlaybackControls from "./PlaybackControls";
 import {
@@ -56,7 +57,6 @@ import TimelineEditor from "./timeline/TimelineEditor";
 import {
 	type AnnotationRegion,
 	type BlurData,
-	type CursorTelemetryPoint,
 	clampFocusToDepth,
 	DEFAULT_ANNOTATION_POSITION,
 	DEFAULT_ANNOTATION_SIZE,
@@ -126,8 +126,6 @@ export default function VideoEditor() {
 	currentTimeRef.current = currentTime;
 	const durationRef = useRef(duration);
 	durationRef.current = duration;
-	const [cursorTelemetry, setCursorTelemetry] = useState<CursorTelemetryPoint[]>([]);
-	const [cursorClickTimestamps, setCursorClickTimestamps] = useState<number[]>([]);
 	const [selectedZoomId, setSelectedZoomId] = useState<string | null>(null);
 	const [selectedTrimId, setSelectedTrimId] = useState<string | null>(null);
 	const [selectedSpeedId, setSelectedSpeedId] = useState<string | null>(null);
@@ -145,12 +143,12 @@ export default function VideoEditor() {
 	const [gifSizePreset, setGifSizePreset] = useState<GifSizePreset>("medium");
 	const [exportedFilePath, setExportedFilePath] = useState<string | null>(null);
 	const [lastSavedSnapshot, setLastSavedSnapshot] = useState<string | null>(null);
-	const [unsavedExport, setUnsavedExport] = useState<{
-		arrayBuffer: ArrayBuffer;
-		fileName: string;
-		format: string;
-	} | null>(null);
-	const [isFullscreen, setIsFullscreen] = useState(false);
+	const cursorTelemetrySourcePath = videoSourcePath ?? (videoPath ? fromFileUrl(videoPath) : null);
+	const { samples: cursorTelemetry, error: cursorTelemetryError } =
+		useCursorTelemetry(cursorTelemetrySourcePath);
+	const { data: cursorRecordingData, error: cursorRecordingDataError } =
+		useCursorRecordingData(cursorTelemetrySourcePath);
+	const cursorClickTimestamps: number[] = [];
 
 	// Cursor & motion blur visual settings (non-undoable preferences)
 	const [showCursor, setShowCursor] = useState(true);
@@ -212,6 +210,13 @@ export default function VideoEditor() {
 			const project = candidate;
 			const sourcePath = project.videoPath;
 			const normalizedEditor = normalizeProjectEditor(project.editor);
+			const inferredDurationMs = Math.max(
+				0,
+				...normalizedEditor.zoomRegions.map((region) => region.endMs),
+				...normalizedEditor.trimRegions.map((region) => region.endMs),
+				...normalizedEditor.speedRegions.map((region) => region.endMs),
+				...normalizedEditor.annotationRegions.map((region) => region.endMs),
+			);
 
 			try {
 				videoPlaybackRef.current?.pause();
@@ -220,7 +225,7 @@ export default function VideoEditor() {
 			}
 			setIsPlaying(false);
 			setCurrentTime(0);
-			setDuration(0);
+			setDuration(inferredDurationMs > 0 ? inferredDurationMs / 1000 : 0);
 
 			setError(null);
 			setVideoSourcePath(sourcePath);
@@ -349,7 +354,7 @@ export default function VideoEditor() {
 	useEffect(() => {
 		async function loadInitialData() {
 			try {
-				const currentProjectResult = await window.electronAPI.loadCurrentProjectFile();
+				const currentProjectResult = await nativeBridgeClient.project.loadCurrentProjectFile();
 				if (currentProjectResult.success && currentProjectResult.project) {
 					const restored = await applyLoadedProject(
 						currentProjectResult.project,
@@ -386,7 +391,7 @@ export default function VideoEditor() {
 					return;
 				}
 
-				const result = await window.electronAPI.getCurrentVideoPath();
+				const result = await nativeBridgeClient.project.getCurrentVideoPath();
 				if (result.success && result.path) {
 					setVideoSourcePath(result.path);
 					setVideoPath(toFileUrl(result.path));
@@ -475,7 +480,7 @@ export default function VideoEditor() {
 			// Match the normalization path used by `currentProjectSnapshot` so the
 			// post-save baseline compares equal and `hasUnsavedChanges` clears.
 			const projectSnapshot = createProjectSnapshot(currentProjectMedia, editorState);
-			const result = await window.electronAPI.saveProjectFile(
+			const result = await nativeBridgeClient.project.saveProjectFile(
 				projectData,
 				fileNameBase,
 				forceSaveAs ? undefined : (currentProjectPath ?? undefined),
@@ -559,7 +564,7 @@ export default function VideoEditor() {
 	}, []);
 
 	const handleLoadProject = useCallback(async () => {
-		const result = await window.electronAPI.loadProjectFile();
+		const result = await nativeBridgeClient.project.loadProjectFile();
 
 		if (result.canceled) {
 			return;
@@ -592,40 +597,16 @@ export default function VideoEditor() {
 	}, [handleLoadProject, handleSaveProject, handleSaveProjectAs]);
 
 	useEffect(() => {
-		let mounted = true;
-
-		async function loadCursorTelemetry() {
-			const sourcePath = currentProjectMedia?.screenVideoPath ?? null;
-
-			if (!sourcePath) {
-				if (mounted) {
-					setCursorTelemetry([]);
-					setCursorClickTimestamps([]);
-				}
-				return;
-			}
-
-			try {
-				const result = await window.electronAPI.getCursorTelemetry(sourcePath);
-				if (mounted) {
-					setCursorTelemetry(result.success ? result.samples : []);
-					setCursorClickTimestamps(result.success ? (result.clicks ?? []) : []);
-				}
-			} catch (telemetryError) {
-				console.warn("Unable to load cursor telemetry:", telemetryError);
-				if (mounted) {
-					setCursorTelemetry([]);
-					setCursorClickTimestamps([]);
-				}
-			}
+		if (cursorTelemetryError) {
+			console.warn("Unable to load cursor telemetry:", cursorTelemetryError);
 		}
+	}, [cursorTelemetryError]);
 
-		loadCursorTelemetry();
-
-		return () => {
-			mounted = false;
-		};
-	}, [currentProjectMedia]);
+	useEffect(() => {
+		if (cursorRecordingDataError) {
+			console.warn("Unable to load cursor recording data:", cursorRecordingDataError);
+		}
+	}, [cursorRecordingDataError]);
 
 	function togglePlayPause() {
 		const playback = videoPlaybackRef.current;
@@ -1419,6 +1400,7 @@ export default function VideoEditor() {
 						padding,
 						videoPadding: padding,
 						cropRegion,
+						cursorRecordingData,
 						annotationRegions,
 						webcamLayoutPreset,
 						webcamMaskShape,
@@ -1561,6 +1543,7 @@ export default function VideoEditor() {
 						borderRadius,
 						padding,
 						cropRegion,
+						cursorRecordingData,
 						annotationRegions,
 						webcamLayoutPreset,
 						webcamMaskShape,
@@ -1644,6 +1627,7 @@ export default function VideoEditor() {
 			borderRadius,
 			padding,
 			cropRegion,
+			cursorRecordingData,
 			annotationRegions,
 			isPlaying,
 			aspectRatio,
@@ -1898,6 +1882,7 @@ export default function VideoEditor() {
 											borderRadius={borderRadius}
 											padding={padding}
 											cropRegion={cropRegion}
+											cursorRecordingData={cursorRecordingData}
 											trimRegions={trimRegions}
 											speedRegions={speedRegions}
 											annotationRegions={annotationOnlyRegions}
@@ -1947,6 +1932,7 @@ export default function VideoEditor() {
 							<div className="h-full bg-[#09090b] rounded-2xl border border-white/5 shadow-lg overflow-hidden flex flex-col">
 								<TimelineEditor
 									videoDuration={duration}
+									hasVideoSource={Boolean(videoPath)}
 									currentTime={currentTime}
 									onSeek={handleSeek}
 									cursorTelemetry={cursorTelemetry}
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index 9eb44cec8..d73472630 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -27,6 +27,12 @@ import {
 } from "@/lib/compositeLayout";
 import { classifyWallpaper, DEFAULT_WALLPAPER, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { getCssClipPath } from "@/lib/webcamMaskShapes";
+import {
+	getNativeCursorDisplayMetrics,
+	projectNativeCursorToStage,
+	resolveActiveNativeCursorFrame,
+} from "@/lib/cursor/nativeCursor";
+import type { CursorRecordingData } from "@/native/contracts";
 import {
 	type AspectRatio,
 	formatAspectRatioForCSS,
@@ -122,6 +128,7 @@ interface VideoPlaybackProps {
 	trimRegions?: TrimRegion[];
 	speedRegions?: SpeedRegion[];
 	aspectRatio: AspectRatio;
+	cursorRecordingData?: CursorRecordingData | null;
 	annotationRegions?: AnnotationRegion[];
 	selectedAnnotationId?: string | null;
 	onSelectAnnotation?: (id: string | null) => void;
@@ -154,6 +161,22 @@ export interface VideoPlaybackRef {
 	pause: () => void;
 }
 
+function getResolvedVideoDuration(video: HTMLVideoElement): number | null {
+	if (Number.isFinite(video.duration) && video.duration > 0) {
+		return video.duration;
+	}
+
+	if (video.seekable.length > 0) {
+		const lastRangeIndex = video.seekable.length - 1;
+		const seekableEnd = video.seekable.end(lastRangeIndex);
+		if (Number.isFinite(seekableEnd) && seekableEnd > 0) {
+			return seekableEnd;
+		}
+	}
+
+	return null;
+}
+
 const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 	(
 		{
@@ -187,6 +210,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			trimRegions = [],
 			speedRegions = [],
 			aspectRatio,
+			cursorRecordingData,
 			annotationRegions = [],
 			selectedAnnotationId,
 			onSelectAnnotation,
@@ -284,6 +308,149 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const videoReadyRafRef = useRef<number | null>(null);
 		const smoothedAutoFocusRef = useRef<ZoomFocus | null>(null);
 		const prevTargetProgressRef = useRef(0);
+		const durationResolutionTimeoutRef = useRef<number | null>(null);
+		const lastResolvedDurationRef = useRef<number | null>(null);
+		const isResolvingDurationRef = useRef(false);
+
+		const activeNativeCursor = useMemo(
+			() => resolveActiveNativeCursorFrame(cursorRecordingData, currentTime * 1000),
+			[cursorRecordingData, currentTime],
+		);
+
+		const nativeCursorStyle = useMemo(() => {
+			if (!activeNativeCursor || !cameraContainerRef.current || !videoContainerRef.current) {
+				return null;
+			}
+
+			const projectedPoint = projectNativeCursorToStage({
+				cameraContainer: cameraContainerRef.current,
+				cropRegion: cropRegion ?? { x: 0, y: 0, width: 1, height: 1 },
+				maskRect: baseMaskRef.current,
+				videoContainerPosition: {
+					x: videoContainerRef.current.x,
+					y: videoContainerRef.current.y,
+				},
+				sample: activeNativeCursor.sample,
+			});
+			if (!projectedPoint) {
+				return null;
+			}
+
+			const metrics = getNativeCursorDisplayMetrics(
+				activeNativeCursor.asset,
+				window.devicePixelRatio || 1,
+			);
+
+			return {
+				left: projectedPoint.x - metrics.hotspotX,
+				top: projectedPoint.y - metrics.hotspotY,
+				width: metrics.width,
+				height: metrics.height,
+			};
+		}, [activeNativeCursor, cropRegion, currentTime]);
+
+		const syncResolvedDuration = useCallback(
+			(video: HTMLVideoElement) => {
+				const resolvedDuration = getResolvedVideoDuration(video);
+				if (!resolvedDuration) {
+					return false;
+				}
+
+				const normalizedDuration = Math.round(resolvedDuration * 1000) / 1000;
+				if (lastResolvedDurationRef.current !== normalizedDuration) {
+					lastResolvedDurationRef.current = normalizedDuration;
+					onDurationChange(normalizedDuration);
+				}
+
+				return true;
+			},
+			[onDurationChange],
+		);
+
+		const forceResolveDuration = useCallback(
+			(video: HTMLVideoElement) => {
+				if (isResolvingDurationRef.current) {
+					return;
+				}
+
+				if (video.readyState < HTMLMediaElement.HAVE_METADATA) {
+					return;
+				}
+
+				isResolvingDurationRef.current = true;
+				const previousMuted = video.muted;
+
+				const finalize = () => {
+					video.removeEventListener("durationchange", handleProgress);
+					video.removeEventListener("timeupdate", handleProgress);
+					video.removeEventListener("loadeddata", handleProgress);
+					video.removeEventListener("ended", handleProgress);
+					if (durationResolutionTimeoutRef.current) {
+						clearTimeout(durationResolutionTimeoutRef.current);
+						durationResolutionTimeoutRef.current = null;
+					}
+					video.muted = previousMuted;
+					isResolvingDurationRef.current = false;
+				};
+
+				const resolveCurrentDuration = () => {
+					if (syncResolvedDuration(video)) {
+						return true;
+					}
+
+					if (Number.isFinite(video.currentTime) && video.currentTime > 0) {
+						lastResolvedDurationRef.current = null;
+						onDurationChange(Math.round(video.currentTime * 1000) / 1000);
+						return true;
+					}
+
+					return false;
+				};
+
+				const handleProgress = () => {
+					if (!resolveCurrentDuration()) {
+						return;
+					}
+
+					try {
+						video.pause();
+						video.currentTime = 0;
+					} catch {
+						// no-op
+					}
+					currentTimeRef.current = 0;
+					finalize();
+				};
+
+				video.addEventListener("durationchange", handleProgress);
+				video.addEventListener("timeupdate", handleProgress);
+				video.addEventListener("loadeddata", handleProgress);
+				video.addEventListener("ended", handleProgress);
+				durationResolutionTimeoutRef.current = window.setTimeout(() => {
+					handleProgress();
+					finalize();
+				}, 1500);
+				video.muted = true;
+
+				const playAttempt = video.play();
+				if (playAttempt && typeof playAttempt.catch === "function") {
+					playAttempt.catch(() => {
+						try {
+							video.currentTime = Math.max(video.currentTime, 0.1);
+						} catch {
+							finalize();
+						}
+					});
+				}
+
+				try {
+					video.currentTime = Math.max(video.currentTime, 0.1);
+				} catch {
+					finalize();
+				}
+			},
+			[onDurationChange, syncResolvedDuration],
+		);
 
 		const clampFocusToStage = useCallback((focus: ZoomFocus, depth: ZoomDepth) => {
 			return clampFocusToStageUtil(focus, depth, stageSizeRef.current);
@@ -840,6 +1007,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 
 		useEffect(() => {
 			if (!videoPath) {
+				lastResolvedDurationRef.current = null;
+				isResolvingDurationRef.current = false;
 				setVideoReady(false);
 				return;
 			}
@@ -850,11 +1019,18 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			video.currentTime = 0;
 			allowPlaybackRef.current = false;
 			lockedVideoDimensionsRef.current = null;
+			lastResolvedDurationRef.current = null;
+			isResolvingDurationRef.current = false;
+			if (durationResolutionTimeoutRef.current) {
+				clearTimeout(durationResolutionTimeoutRef.current);
+				durationResolutionTimeoutRef.current = null;
+			}
 			setVideoReady(false);
 			if (videoReadyRafRef.current) {
 				cancelAnimationFrame(videoReadyRafRef.current);
 				videoReadyRafRef.current = null;
 			}
+			video.load();
 		}, [videoPath]);
 
 		useEffect(() => {
@@ -1296,8 +1472,12 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 
 		const handleLoadedMetadata = (e: React.SyntheticEvent<HTMLVideoElement, Event>) => {
 			const video = e.currentTarget;
-			onDurationChange(video.duration);
-			video.currentTime = 0;
+			const hasResolvedDuration = syncResolvedDuration(video);
+			if (!hasResolvedDuration) {
+				forceResolveDuration(video);
+			} else {
+				video.currentTime = 0;
+			}
 			video.pause();
 			allowPlaybackRef.current = false;
 			currentTimeRef.current = 0;
@@ -1310,6 +1490,9 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			const waitForRenderableFrame = () => {
 				const hasDimensions = video.videoWidth > 0 && video.videoHeight > 0;
 				const hasData = video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA;
+				if (!syncResolvedDuration(video)) {
+					forceResolveDuration(video);
+				}
 				if (hasDimensions && hasData) {
 					videoReadyRafRef.current = null;
 					setVideoReady(true);
@@ -1409,6 +1592,10 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					window.clearTimeout(scrubEndTimerRef.current);
 					scrubEndTimerRef.current = null;
 				}
+				if (durationResolutionTimeoutRef.current) {
+					clearTimeout(durationResolutionTimeoutRef.current);
+					durationResolutionTimeoutRef.current = null;
+				}
 			};
 		}, []);
 
@@ -1524,6 +1711,22 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 								className="absolute rounded-md border border-[#34B27B]/80 bg-[#34B27B]/20 shadow-[0_0_0_1px_rgba(52,178,123,0.35)]"
 								style={{ display: "none", pointerEvents: "none" }}
 							/>
+							{activeNativeCursor && nativeCursorStyle ? (
+								<img
+									alt=""
+									aria-hidden="true"
+									src={activeNativeCursor.asset.imageDataUrl}
+									className="absolute select-none"
+									style={{
+										left: nativeCursorStyle.left,
+										top: nativeCursorStyle.top,
+										width: nativeCursorStyle.width,
+										height: nativeCursorStyle.height,
+										pointerEvents: "none",
+										userSelect: "none",
+									}}
+								/>
+							) : null}
 							{(() => {
 								const filteredAnnotations = (annotationRegions || []).filter((annotation) => {
 									if (
@@ -1652,11 +1855,24 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					ref={videoRef}
 					src={videoPath}
 					className="hidden"
-					preload="metadata"
+					preload="auto"
+					muted
 					playsInline
 					onLoadedMetadata={handleLoadedMetadata}
 					onDurationChange={(e) => {
-						onDurationChange(e.currentTarget.duration);
+						if (!syncResolvedDuration(e.currentTarget)) {
+							forceResolveDuration(e.currentTarget);
+						}
+					}}
+					onLoadedData={(e) => {
+						if (!syncResolvedDuration(e.currentTarget)) {
+							forceResolveDuration(e.currentTarget);
+						}
+					}}
+					onCanPlay={(e) => {
+						if (!syncResolvedDuration(e.currentTarget)) {
+							forceResolveDuration(e.currentTarget);
+						}
 					}}
 					onError={() => onError("Failed to load video")}
 				/>
diff --git a/src/components/video-editor/timeline/TimelineEditor.tsx b/src/components/video-editor/timeline/TimelineEditor.tsx
index 6fe3474d8..e407aa984 100644
--- a/src/components/video-editor/timeline/TimelineEditor.tsx
+++ b/src/components/video-editor/timeline/TimelineEditor.tsx
@@ -52,6 +52,7 @@ const SUGGESTION_SPACING_MS = 1800;
 
 interface TimelineEditorProps {
 	videoDuration: number;
+	hasVideoSource?: boolean;
 	currentTime: number;
 	onSeek?: (time: number) => void;
 	cursorTelemetry?: CursorTelemetryPoint[];
@@ -765,6 +766,7 @@ function Timeline({
 
 export default function TimelineEditor({
 	videoDuration,
+	hasVideoSource = false,
 	currentTime,
 	onSeek,
 	cursorTelemetry = [],
@@ -1437,8 +1439,14 @@ export default function TimelineEditor({
 					<Plus className="w-6 h-6 text-slate-600" />
 				</div>
 				<div className="text-center">
-					<p className="text-sm font-medium text-slate-300">{t("emptyState.noVideo")}</p>
-					<p className="text-xs text-slate-500 mt-1">{t("emptyState.dragAndDrop")}</p>
+					<p className="text-sm font-medium text-slate-300">
+						{hasVideoSource ? "Loading Timeline" : "No Video Loaded"}
+					</p>
+					<p className="text-xs text-slate-500 mt-1">
+						{hasVideoSource
+							? "Video opened, waiting for duration metadata"
+							: "Drag and drop a video to start editing"}
+					</p>
 				</div>
 			</div>
 		);
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
new file mode 100644
index 000000000..23e187bea
--- /dev/null
+++ b/src/lib/cursor/nativeCursor.ts
@@ -0,0 +1,101 @@
+import { type Container, Point } from "pixi.js";
+import type { CropRegion } from "@/components/video-editor/types";
+import type {
+	CursorRecordingData,
+	CursorRecordingSample,
+	NativeCursorAsset,
+} from "@/native/contracts";
+
+export interface ActiveNativeCursorFrame {
+	asset: NativeCursorAsset;
+	sample: CursorRecordingSample;
+}
+
+interface ProjectNativeCursorOptions {
+	cameraContainer: Container;
+	cropRegion: CropRegion;
+	maskRect: { width: number; height: number };
+	videoContainerPosition: { x: number; y: number };
+	sample: CursorRecordingSample;
+}
+
+function clamp(value: number, min: number, max: number) {
+	return Math.min(max, Math.max(min, value));
+}
+
+function getCroppedCursorPosition(sample: CursorRecordingSample, cropRegion: CropRegion) {
+	if (cropRegion.width <= 0 || cropRegion.height <= 0) {
+		return null;
+	}
+
+	const croppedCx = (sample.cx - cropRegion.x) / cropRegion.width;
+	const croppedCy = (sample.cy - cropRegion.y) / cropRegion.height;
+
+	if (croppedCx < 0 || croppedCx > 1 || croppedCy < 0 || croppedCy > 1) {
+		return null;
+	}
+
+	return {
+		cx: clamp(croppedCx, 0, 1),
+		cy: clamp(croppedCy, 0, 1),
+	};
+}
+
+export function resolveActiveNativeCursorFrame(
+	recordingData: CursorRecordingData | null | undefined,
+	timeMs: number,
+): ActiveNativeCursorFrame | null {
+	if (!recordingData || recordingData.provider !== "native" || recordingData.assets.length === 0) {
+		return null;
+	}
+
+	for (let index = recordingData.samples.length - 1; index >= 0; index -= 1) {
+		const sample = recordingData.samples[index];
+		if (sample.timeMs > timeMs) {
+			continue;
+		}
+
+		if (sample.visible === false || !sample.assetId) {
+			return null;
+		}
+
+		const asset = recordingData.assets.find((candidate) => candidate.id === sample.assetId);
+		if (!asset) {
+			return null;
+		}
+
+		return { sample, asset };
+	}
+
+	return null;
+}
+
+export function projectNativeCursorToStage({
+	cameraContainer,
+	cropRegion,
+	maskRect,
+	videoContainerPosition,
+	sample,
+}: ProjectNativeCursorOptions) {
+	const croppedPosition = getCroppedCursorPosition(sample, cropRegion);
+	if (!croppedPosition) {
+		return null;
+	}
+
+	const localPoint = new Point(
+		videoContainerPosition.x + croppedPosition.cx * maskRect.width,
+		videoContainerPosition.y + croppedPosition.cy * maskRect.height,
+	);
+
+	return cameraContainer.toGlobal(localPoint);
+}
+
+export function getNativeCursorDisplayMetrics(asset: NativeCursorAsset, deviceScaleFactor: number) {
+	const scaleFactor = asset.scaleFactor ?? deviceScaleFactor ?? 1;
+	return {
+		width: asset.width / scaleFactor,
+		height: asset.height / scaleFactor,
+		hotspotX: asset.hotspotX / scaleFactor,
+		hotspotY: asset.hotspotY / scaleFactor,
+	};
+}
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index 5906c703c..429203972 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -57,8 +57,14 @@ import {
 	type Size,
 	type StyledRenderRect,
 } from "@/lib/compositeLayout";
+import {
+	getNativeCursorDisplayMetrics,
+	projectNativeCursorToStage,
+	resolveActiveNativeCursorFrame,
+} from "@/lib/cursor/nativeCursor";
 import { BackgroundLoadError, classifyWallpaper, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { drawCanvasClipPath } from "@/lib/webcamMaskShapes";
+import type { CursorRecordingData, NativeCursorAsset } from "@/native/contracts";
 import { renderAnnotations } from "./annotationRenderer";
 import {
 	getLinearGradientPoints,
@@ -80,6 +86,7 @@ interface FrameRenderConfig {
 	borderRadius?: number;
 	padding?: number;
 	cropRegion: CropRegion;
+	cursorRecordingData?: CursorRecordingData | null;
 	videoWidth: number;
 	videoHeight: number;
 	webcamSize?: Size | null;
@@ -137,6 +144,7 @@ export class FrameRenderer {
 	private rasterCtx: CanvasRenderingContext2D | null = null;
 	private threeDPass: ThreeDPass | null = null;
 	private currentRotation3D: Rotation3D = { ...DEFAULT_ROTATION_3D };
+	private cursorImageCache = new Map<string, HTMLImageElement>();
 	private config: FrameRenderConfig;
 	private animationState: AnimationState;
 	private layoutCache: LayoutCache | null = null;
@@ -469,6 +477,8 @@ export class FrameRenderer {
 			}
 		}
 
+		await this.drawNativeCursor(timeMs);
+
 		// Render annotations on top of foreground (so they rotate with recording).
 		if (
 			this.config.annotationRegions &&
@@ -544,7 +554,63 @@ export class FrameRenderer {
 		}
 	}
 
-	private updateLayout(webcamFrame?: VideoFrame | null): void {
+	private async drawNativeCursor(timeMs: number) {
+		if (!this.compositeCtx || !this.cameraContainer || !this.videoContainer || !this.layoutCache) {
+			return;
+		}
+
+		const activeNativeCursor = resolveActiveNativeCursorFrame(
+			this.config.cursorRecordingData,
+			timeMs,
+		);
+		if (!activeNativeCursor) {
+			return;
+		}
+
+		const projectedPoint = projectNativeCursorToStage({
+			cameraContainer: this.cameraContainer,
+			cropRegion: this.config.cropRegion,
+			maskRect: this.layoutCache.maskRect,
+			videoContainerPosition: {
+				x: this.videoContainer.x,
+				y: this.videoContainer.y,
+			},
+			sample: activeNativeCursor.sample,
+		});
+		if (!projectedPoint) {
+			return;
+		}
+
+		const image = await this.getCursorImage(activeNativeCursor.asset);
+		const metrics = getNativeCursorDisplayMetrics(activeNativeCursor.asset, 1);
+
+		this.compositeCtx.drawImage(
+			image,
+			projectedPoint.x - metrics.hotspotX,
+			projectedPoint.y - metrics.hotspotY,
+			metrics.width,
+			metrics.height,
+		);
+	}
+
+	private async getCursorImage(asset: NativeCursorAsset) {
+		const cachedImage = this.cursorImageCache.get(asset.id);
+		if (cachedImage) {
+			return cachedImage;
+		}
+
+		const image = new Image();
+		await new Promise<void>((resolve, reject) => {
+			image.onload = () => resolve();
+			image.onerror = () => reject(new Error(`Failed to load cursor asset ${asset.id}`));
+			image.src = asset.imageDataUrl;
+		});
+
+		this.cursorImageCache.set(asset.id, image);
+		return image;
+	}
+
+	private updateLayout(): void {
 		if (!this.app || !this.videoSprite || !this.maskGraphics || !this.videoContainer) return;
 
 		const { width, height } = this.config;
@@ -1001,5 +1067,6 @@ export class FrameRenderer {
 			this.threeDPass.destroy();
 			this.threeDPass = null;
 		}
+		this.cursorImageCache.clear();
 	}
 }
diff --git a/src/lib/exporter/gifExporter.ts b/src/lib/exporter/gifExporter.ts
index 0d7a432ba..02564db45 100644
--- a/src/lib/exporter/gifExporter.ts
+++ b/src/lib/exporter/gifExporter.ts
@@ -11,6 +11,7 @@ import type {
 import { BackgroundLoadError } from "@/lib/wallpaper";
 import { getPlatform } from "@/utils/platformUtils";
 import { AsyncVideoFrameQueue } from "./asyncVideoFrameQueue";
+import type { CursorRecordingData } from "@/native/contracts";
 import { FrameRenderer } from "./frameRenderer";
 import { StreamingVideoDecoder } from "./streamingDecoder";
 import type {
@@ -47,6 +48,7 @@ interface GifExporterConfig {
 	webcamMaskShape?: import("@/components/video-editor/types").WebcamMaskShape;
 	webcamSizePreset?: WebcamSizePreset;
 	webcamPosition?: { cx: number; cy: number } | null;
+	cursorRecordingData?: CursorRecordingData | null;
 	annotationRegions?: AnnotationRegion[];
 	previewWidth?: number;
 	previewHeight?: number;
@@ -151,6 +153,7 @@ export class GifExporter {
 				borderRadius: this.config.borderRadius,
 				padding: this.config.padding,
 				cropRegion: this.config.cropRegion,
+				cursorRecordingData: this.config.cursorRecordingData,
 				videoWidth: videoInfo.width,
 				videoHeight: videoInfo.height,
 				webcamSize: webcamInfo ? { width: webcamInfo.width, height: webcamInfo.height } : null,
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index e064ba7c9..edddd05b5 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -10,6 +10,7 @@ import type {
 import { BackgroundLoadError } from "@/lib/wallpaper";
 import { getPlatform } from "@/utils/platformUtils";
 import { AsyncVideoFrameQueue } from "./asyncVideoFrameQueue";
+import type { CursorRecordingData } from "@/native/contracts";
 import { AudioProcessor } from "./audioEncoder";
 import { FrameRenderer } from "./frameRenderer";
 import { VideoMuxer } from "./muxer";
@@ -38,6 +39,7 @@ interface VideoExporterConfig extends ExportConfig {
 	webcamMaskShape?: import("@/components/video-editor/types").WebcamMaskShape;
 	webcamSizePreset?: WebcamSizePreset;
 	webcamPosition?: { cx: number; cy: number } | null;
+	cursorRecordingData?: CursorRecordingData | null;
 	annotationRegions?: AnnotationRegion[];
 	previewWidth?: number;
 	previewHeight?: number;
@@ -146,6 +148,7 @@ export class VideoExporter {
 				borderRadius: this.config.borderRadius,
 				padding: this.config.padding,
 				cropRegion: this.config.cropRegion,
+				cursorRecordingData: this.config.cursorRecordingData,
 				videoWidth: videoInfo.width,
 				videoHeight: videoInfo.height,
 				webcamSize: webcamInfo ? { width: webcamInfo.width, height: webcamInfo.height } : null,

From 96e282959cd454615c5a1b8e7c0fe9c9ecfa37d3 Mon Sep 17 00:00:00 2001
From: Etienne Lescot <etiennelescot@gmail.com>
Date: Thu, 26 Mar 2026 11:16:41 +0100
Subject: [PATCH 04/38] feat: add cursor overlay pipeline for high-fidelity
 cursor recording and playback

- Implement native bridge for Windows cursor capture via PowerShell/C#
- Add cursor-free capture using getDisplayMedia with setDisplayMediaRequestHandler
- Update video player and exporters to support native cursor telemetry
- Enable system audio capture on Windows via WASAPI loopback
- Add interpolation for smoother cursor movement in playback and export
- Improve cursor scaling and visibility handling in editor and playback
---
 electron/ipc/handlers.ts                      | 124 +++++--
 electron/main.ts                              |  17 +-
 .../native-bridge/cursor/recording/factory.ts |   2 +
 .../windowsNativeRecordingSession.script.ts   | 216 +++++++++++
 .../windowsNativeRecordingSession.ts          | 350 ++++++++----------
 .../windowsNativeRecordingSession.types.ts    |  49 +++
 src/components/launch/LaunchWindow.tsx        |   8 +
 src/components/video-editor/VideoEditor.tsx   |   2 +
 src/components/video-editor/VideoPlayback.tsx | 125 ++++---
 src/hooks/useScreenRecorder.ts                |  50 +--
 src/lib/cursor/nativeCursor.ts                |  78 +++-
 src/lib/exporter/frameRenderer.ts             |  19 +-
 src/lib/exporter/gifExporter.ts               |   2 +
 src/lib/exporter/videoExporter.ts             |   2 +
 14 files changed, 711 insertions(+), 333 deletions(-)
 create mode 100644 electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
 create mode 100644 electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 74080035b..2a1b8302b 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -1,10 +1,7 @@
 import fs from "node:fs/promises";
-import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
-const nodeRequire = createRequire(import.meta.url);
-
 import {
 	app,
 	BrowserWindow,
@@ -15,10 +12,7 @@ import {
 	shell,
 	systemPreferences,
 } from "electron";
-import {
-	type CursorTelemetryPoint,
-	createCursorTelemetryBuffer,
-} from "../../src/lib/cursorTelemetryBuffer";
+import type { DesktopCapturerSource } from "electron";
 import {
 	normalizeProjectMedia,
 	normalizeRecordingSession,
@@ -197,11 +191,24 @@ async function getApprovedProjectSession(
 
 type SelectedSource = {
 	name: string;
+	id?: string;
+	display_id?: string;
 	[key: string]: unknown;
 };
 
 let selectedSource: SelectedSource | null = null;
+let selectedDesktopSource: DesktopCapturerSource | null = null;
+let lastEnumeratedSources = new Map<string, DesktopCapturerSource>();
 let currentProjectPath: string | null = null;
+let currentRecordingSession: RecordingSession | null = null;
+
+/**
+ * Returns the cached DesktopCapturerSource set when the user picked a source.
+ * Used by setDisplayMediaRequestHandler in main.ts for cursor-free capture.
+ */
+export function getSelectedDesktopSource(): DesktopCapturerSource | null {
+	return selectedDesktopSource;
+}
 let currentVideoPath: string | null = null;
 
 function normalizePath(filePath: string) {
@@ -237,16 +244,12 @@ function isTrustedProjectPath(filePath?: string | null) {
 }
 
 const CURSOR_TELEMETRY_VERSION = 2;
-const CURSOR_SAMPLE_INTERVAL_MS = 100;
-const MAX_CURSOR_SAMPLES = 60 * 60 * 10; // 1 hour @ 10Hz
+const CURSOR_SAMPLE_INTERVAL_MS = 33;
+const MAX_CURSOR_SAMPLES = 60 * 60 * 30; // 1 hour @ 30Hz
 
 let cursorRecordingSession: CursorRecordingSession | null = null;
 let pendingCursorRecordingData: CursorRecordingData | null = null;
 
-function clamp(value: number, min: number, max: number) {
-	return Math.min(max, Math.max(min, value));
-}
-
 function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 	if (!sample || typeof sample !== "object") {
 		return null;
@@ -258,8 +261,8 @@ function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 			typeof point.timeMs === "number" && Number.isFinite(point.timeMs)
 				? Math.max(0, point.timeMs)
 				: 0,
-		cx: typeof point.cx === "number" && Number.isFinite(point.cx) ? clamp(point.cx, 0, 1) : 0.5,
-		cy: typeof point.cy === "number" && Number.isFinite(point.cy) ? clamp(point.cy, 0, 1) : 0.5,
+		cx: typeof point.cx === "number" && Number.isFinite(point.cx) ? point.cx : 0.5,
+		cy: typeof point.cy === "number" && Number.isFinite(point.cy) ? point.cy : 0.5,
 		assetId: typeof point.assetId === "string" ? point.assetId : null,
 		visible: typeof point.visible === "boolean" ? point.visible : true,
 	};
@@ -394,6 +397,55 @@ function getSelectedSourceBounds() {
 	return (sourceDisplay ?? screen.getDisplayNearestPoint(cursor)).bounds;
 }
 
+function getSelectedSourceId() {
+	return typeof selectedSource?.id === "string" ? selectedSource.id : null;
+}
+
+function setCurrentRecordingSessionState(session: RecordingSession | null) {
+	currentRecordingSession = session;
+	currentVideoPath = session?.screenVideoPath ?? null;
+}
+
+async function storeRecordedSessionFiles(payload: StoreRecordedSessionInput) {
+	const createdAt =
+		typeof payload.createdAt === "number" && Number.isFinite(payload.createdAt)
+			? payload.createdAt
+			: Date.now();
+	const screenVideoPath = resolveRecordingOutputPath(payload.screen.fileName);
+	await fs.writeFile(screenVideoPath, Buffer.from(payload.screen.videoData));
+
+	let webcamVideoPath: string | undefined;
+	if (payload.webcam) {
+		webcamVideoPath = resolveRecordingOutputPath(payload.webcam.fileName);
+		await fs.writeFile(webcamVideoPath, Buffer.from(payload.webcam.videoData));
+	}
+
+	const session: RecordingSession = webcamVideoPath
+		? { screenVideoPath, webcamVideoPath, createdAt }
+		: { screenVideoPath, createdAt };
+	setCurrentRecordingSessionState(session);
+	currentProjectPath = null;
+
+	const telemetryPath = `${screenVideoPath}.cursor.json`;
+	if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
+		await fs.writeFile(telemetryPath, JSON.stringify(pendingCursorRecordingData, null, 2), "utf-8");
+	}
+	pendingCursorRecordingData = null;
+
+	const sessionManifestPath = path.join(
+		RECORDINGS_DIR,
+		`${path.parse(payload.screen.fileName).name}${RECORDING_SESSION_SUFFIX}`,
+	);
+	await fs.writeFile(sessionManifestPath, JSON.stringify(session, null, 2), "utf-8");
+
+	return {
+		success: true,
+		path: screenVideoPath,
+		session,
+		message: "Recording session stored successfully",
+	};
+}
+
 export function registerIpcHandlers(
 	createEditorWindow: () => void,
 	createSourceSelectorWindow: () => BrowserWindow,
@@ -403,6 +455,7 @@ export function registerIpcHandlers(
 ) {
 	ipcMain.handle("get-sources", async (_, opts) => {
 		const sources = await desktopCapturer.getSources(opts);
+		lastEnumeratedSources = new Map(sources.map((source) => [source.id, source]));
 		return sources.map((source) => ({
 			id: source.id,
 			name: source.name,
@@ -412,8 +465,26 @@ export function registerIpcHandlers(
 		}));
 	});
 
-	ipcMain.handle("select-source", (_, source: SelectedSource) => {
+	ipcMain.handle("select-source", async (_, source: SelectedSource) => {
 		selectedSource = source;
+		// Reuse the exact source object returned during enumeration to avoid
+		// Windows window-source id mismatches across separate getSources() calls.
+		selectedDesktopSource =
+			typeof source.id === "string" ? lastEnumeratedSources.get(source.id) ?? null : null;
+
+		if (!selectedDesktopSource && typeof source.id === "string") {
+			try {
+				const sources = await desktopCapturer.getSources({
+					types: ["screen", "window"],
+					thumbnailSize: { width: 0, height: 0 },
+					fetchWindowIcons: true,
+				});
+				lastEnumeratedSources = new Map(sources.map((candidate) => [candidate.id, candidate]));
+				selectedDesktopSource = lastEnumeratedSources.get(source.id) ?? null;
+			} catch {
+				selectedDesktopSource = null;
+			}
+		}
 		const sourceSelectorWin = getSourceSelectorWindow();
 		if (sourceSelectorWin) {
 			sourceSelectorWin.close();
@@ -476,25 +547,7 @@ export function registerIpcHandlers(
 
 	ipcMain.handle("store-recorded-session", async (_, payload: StoreRecordedSessionInput) => {
 		try {
-			const videoPath = path.join(RECORDINGS_DIR, fileName);
-			await fs.writeFile(videoPath, Buffer.from(videoData));
-			currentProjectPath = null;
-
-			const telemetryPath = `${videoPath}.cursor.json`;
-			if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
-				await fs.writeFile(
-					telemetryPath,
-					JSON.stringify(pendingCursorRecordingData, null, 2),
-					"utf-8",
-				);
-			}
-			pendingCursorRecordingData = null;
-
-			return {
-				success: true,
-				path: videoPath,
-				message: "Video stored successfully",
-			};
+			return await storeRecordedSessionFiles(payload);
 		} catch (error) {
 			console.error("Failed to store recording session:", error);
 			return {
@@ -559,6 +612,7 @@ export function registerIpcHandlers(
 				maxSamples: MAX_CURSOR_SAMPLES,
 				platform: process.platform,
 				sampleIntervalMs: CURSOR_SAMPLE_INTERVAL_MS,
+				sourceId: getSelectedSourceId(),
 			});
 
 			try {
diff --git a/electron/main.ts b/electron/main.ts
index 0b90b8921..3e237eb58 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -13,7 +13,7 @@ import {
 	Tray,
 } from "electron";
 import { mainT, setMainLocale } from "./i18n";
-import { registerIpcHandlers } from "./ipc/handlers";
+import { getSelectedDesktopSource, registerIpcHandlers } from "./ipc/handlers";
 import {
 	createCountdownOverlayWindow,
 	createEditorWindow,
@@ -385,6 +385,21 @@ app.whenReady().then(async () => {
 		app.dock?.show();
 	}
 
+	// Intercept getDisplayMedia to return the pre-selected source without the cursor.
+	// The source is cached synchronously at select-source time to avoid async delays here.
+	session.defaultSession.setDisplayMediaRequestHandler((_request, callback) => {
+		const source = getSelectedDesktopSource();
+		if (!source) {
+			callback({});
+			return;
+		}
+		callback({
+			video: source,
+			// WASAPI loopback provides system audio capture on Windows.
+			...(process.platform === "win32" && { audio: "loopback" as const }),
+		});
+	});
+
 	// Allow microphone/media permission checks
 	session.defaultSession.setPermissionCheckHandler((_webContents, permission) => {
 		const allowed = ["media", "audioCapture", "microphone", "videoCapture", "camera"];
diff --git a/electron/native-bridge/cursor/recording/factory.ts b/electron/native-bridge/cursor/recording/factory.ts
index fe92991fd..4e0f75c01 100644
--- a/electron/native-bridge/cursor/recording/factory.ts
+++ b/electron/native-bridge/cursor/recording/factory.ts
@@ -8,6 +8,7 @@ interface CreateCursorRecordingSessionOptions {
 	maxSamples: number;
 	platform: NodeJS.Platform;
 	sampleIntervalMs: number;
+	sourceId?: string | null;
 }
 
 export function createCursorRecordingSession(
@@ -18,6 +19,7 @@ export function createCursorRecordingSession(
 			getDisplayBounds: options.getDisplayBounds,
 			maxSamples: options.maxSamples,
 			sampleIntervalMs: options.sampleIntervalMs,
+			sourceId: options.sourceId,
 		});
 	}
 
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
new file mode 100644
index 000000000..b7a11cb46
--- /dev/null
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -0,0 +1,216 @@
+export function parseWindowHandleFromSourceId(sourceId?: string | null) {
+	if (!sourceId?.startsWith("window:")) {
+		return null;
+	}
+
+	const handlePart = sourceId.split(":")[1];
+	if (!handlePart || !/^\d+$/.test(handlePart)) {
+		return null;
+	}
+
+	return handlePart;
+}
+
+export function buildPowerShellCommand(sampleIntervalMs: number, windowHandle?: string | null) {
+	const script = String.raw`
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Drawing
+
+$targetWindowHandle = ${windowHandle ? `'${windowHandle}'` : '$null'}
+
+$source = @"
+using System;
+using System.Runtime.InteropServices;
+
+public static class OpenScreenCursorInterop {
+    [StructLayout(LayoutKind.Sequential)]
+    public struct POINT {
+        public int X;
+        public int Y;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct CURSORINFO {
+        public int cbSize;
+        public int flags;
+        public IntPtr hCursor;
+        public POINT ptScreenPos;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ICONINFO {
+        [MarshalAs(UnmanagedType.Bool)]
+        public bool fIcon;
+        public int xHotspot;
+        public int yHotspot;
+        public IntPtr hbmMask;
+        public IntPtr hbmColor;
+    }
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct RECT {
+		public int Left;
+		public int Top;
+		public int Right;
+		public int Bottom;
+	}
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool GetCursorInfo(ref CURSORINFO pci);
+
+	[DllImport("user32.dll", SetLastError = true)]
+	[return: MarshalAs(UnmanagedType.Bool)]
+	public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+	[DllImport("user32.dll", SetLastError = true)]
+	[return: MarshalAs(UnmanagedType.Bool)]
+	public static extern bool IsWindow(IntPtr hWnd);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr CopyIcon(IntPtr hIcon);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DestroyIcon(IntPtr hIcon);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool GetIconInfo(IntPtr hIcon, out ICONINFO piconinfo);
+
+    [DllImport("gdi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DeleteObject(IntPtr hObject);
+}
+"@
+
+Add-Type -TypeDefinition $source
+
+function Write-JsonLine($payload) {
+    [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
+}
+
+function Get-TargetBounds() {
+	if ([string]::IsNullOrWhiteSpace($targetWindowHandle)) {
+		return $null
+	}
+
+	try {
+		$handleValue = [int64]::Parse($targetWindowHandle)
+		$windowHandle = [IntPtr]::new($handleValue)
+		if (-not [OpenScreenCursorInterop]::IsWindow($windowHandle)) {
+			return $null
+		}
+
+		$rect = New-Object OpenScreenCursorInterop+RECT
+		if (-not [OpenScreenCursorInterop]::GetWindowRect($windowHandle, [ref]$rect)) {
+			return $null
+		}
+
+		$width = $rect.Right - $rect.Left
+		$height = $rect.Bottom - $rect.Top
+		if ($width -le 0 -or $height -le 0) {
+			return $null
+		}
+
+		return @{
+			x = $rect.Left
+			y = $rect.Top
+			width = $width
+			height = $height
+		}
+	}
+	catch {
+		return $null
+	}
+}
+
+function Get-CursorAsset($cursorHandle, $cursorId) {
+    $copiedHandle = [OpenScreenCursorInterop]::CopyIcon($cursorHandle)
+    if ($copiedHandle -eq [IntPtr]::Zero) {
+        return $null
+    }
+
+    $iconInfo = New-Object OpenScreenCursorInterop+ICONINFO
+    $hasIconInfo = [OpenScreenCursorInterop]::GetIconInfo($copiedHandle, [ref]$iconInfo)
+
+    try {
+        $icon = [System.Drawing.Icon]::FromHandle($copiedHandle)
+        $bitmap = New-Object System.Drawing.Bitmap $icon.Width, $icon.Height, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
+        $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+        $memoryStream = New-Object System.IO.MemoryStream
+
+        try {
+            $graphics.Clear([System.Drawing.Color]::Transparent)
+            $graphics.DrawIcon($icon, 0, 0)
+            $bitmap.Save($memoryStream, [System.Drawing.Imaging.ImageFormat]::Png)
+            $base64 = [System.Convert]::ToBase64String($memoryStream.ToArray())
+
+            return @{
+                id = $cursorId
+                imageDataUrl = "data:image/png;base64,$base64"
+                width = $bitmap.Width
+                height = $bitmap.Height
+                hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
+                hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+            }
+        }
+        finally {
+            $memoryStream.Dispose()
+            $graphics.Dispose()
+            $bitmap.Dispose()
+            $icon.Dispose()
+        }
+    }
+    finally {
+        if ($hasIconInfo) {
+            if ($iconInfo.hbmMask -ne [IntPtr]::Zero) {
+                [OpenScreenCursorInterop]::DeleteObject($iconInfo.hbmMask) | Out-Null
+            }
+            if ($iconInfo.hbmColor -ne [IntPtr]::Zero) {
+                [OpenScreenCursorInterop]::DeleteObject($iconInfo.hbmColor) | Out-Null
+            }
+        }
+        [OpenScreenCursorInterop]::DestroyIcon($copiedHandle) | Out-Null
+    }
+}
+
+Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
+
+$lastCursorId = $null
+while ($true) {
+    $cursorInfo = New-Object OpenScreenCursorInterop+CURSORINFO
+    $cursorInfo.cbSize = [Runtime.InteropServices.Marshal]::SizeOf([type][OpenScreenCursorInterop+CURSORINFO])
+
+    if (-not [OpenScreenCursorInterop]::GetCursorInfo([ref]$cursorInfo)) {
+        Write-JsonLine @{ type = 'error'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds(); message = 'GetCursorInfo failed' }
+        Start-Sleep -Milliseconds ${sampleIntervalMs}
+        continue
+    }
+
+    $visible = ($cursorInfo.flags -band 1) -ne 0
+    $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
+    $asset = $null
+
+    if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
+        $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
+        $lastCursorId = $cursorId
+    }
+
+    Write-JsonLine @{
+        type = 'sample'
+        timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()
+        x = $cursorInfo.ptScreenPos.X
+        y = $cursorInfo.ptScreenPos.Y
+        visible = $visible
+        handle = $cursorId
+		bounds = Get-TargetBounds
+        asset = $asset
+    }
+
+    Start-Sleep -Milliseconds ${sampleIntervalMs}
+}
+`;
+
+	return Buffer.from(script, "utf16le").toString("base64");
+}
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index a0540ed89..d5e43d777 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -1,206 +1,23 @@
 import { type ChildProcessByStdio, spawn } from "node:child_process";
 import type { Readable } from "node:stream";
-import { type Rectangle, screen } from "electron";
+import { screen } from "electron";
 import type {
 	CursorRecordingData,
 	CursorRecordingSample,
 	NativeCursorAsset,
 } from "../../../../src/native/contracts";
 import type { CursorRecordingSession } from "./session";
+import { buildPowerShellCommand, parseWindowHandleFromSourceId } from "./windowsNativeRecordingSession.script";
+import type {
+	WindowsCursorEvent,
+	WindowsNativeRecordingSessionOptions,
+} from "./windowsNativeRecordingSession.types";
 
-interface WindowsCursorSampleEvent {
-	type: "sample";
-	timestampMs: number;
-	x: number;
-	y: number;
-	visible: boolean;
-	handle: string | null;
-	asset?: WindowsCursorAssetPayload;
-}
-
-interface WindowsCursorReadyEvent {
-	type: "ready";
-	timestampMs: number;
-}
-
-interface WindowsCursorErrorEvent {
-	type: "error";
-	timestampMs: number;
-	message: string;
-}
-
-interface WindowsCursorAssetPayload {
-	id: string;
-	imageDataUrl: string;
-	width: number;
-	height: number;
-	hotspotX: number;
-	hotspotY: number;
-}
-
-type WindowsCursorEvent =
-	| WindowsCursorSampleEvent
-	| WindowsCursorReadyEvent
-	| WindowsCursorErrorEvent;
-
-interface WindowsNativeRecordingSessionOptions {
-	getDisplayBounds: () => Rectangle | null;
-	maxSamples: number;
-	sampleIntervalMs: number;
-}
-
-function clamp(value: number, min: number, max: number) {
-	return Math.min(max, Math.max(min, value));
-}
-
-function buildPowerShellCommand(sampleIntervalMs: number) {
-	const script = String.raw`
-$ErrorActionPreference = 'Stop'
-Add-Type -AssemblyName System.Drawing
-
-$source = @"
-using System;
-using System.Runtime.InteropServices;
-
-public static class OpenScreenCursorInterop {
-    [StructLayout(LayoutKind.Sequential)]
-    public struct POINT {
-        public int X;
-        public int Y;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct CURSORINFO {
-        public int cbSize;
-        public int flags;
-        public IntPtr hCursor;
-        public POINT ptScreenPos;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct ICONINFO {
-        [MarshalAs(UnmanagedType.Bool)]
-        public bool fIcon;
-        public int xHotspot;
-        public int yHotspot;
-        public IntPtr hbmMask;
-        public IntPtr hbmColor;
-    }
-
-    [DllImport("user32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static extern bool GetCursorInfo(ref CURSORINFO pci);
-
-    [DllImport("user32.dll", SetLastError = true)]
-    public static extern IntPtr CopyIcon(IntPtr hIcon);
-
-    [DllImport("user32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static extern bool DestroyIcon(IntPtr hIcon);
-
-    [DllImport("user32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static extern bool GetIconInfo(IntPtr hIcon, out ICONINFO piconinfo);
-
-    [DllImport("gdi32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static extern bool DeleteObject(IntPtr hObject);
-}
-"@
-
-Add-Type -TypeDefinition $source
-
-function Write-JsonLine($payload) {
-    [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
-}
-
-function Get-CursorAsset($cursorHandle, $cursorId) {
-    $copiedHandle = [OpenScreenCursorInterop]::CopyIcon($cursorHandle)
-    if ($copiedHandle -eq [IntPtr]::Zero) {
-        return $null
-    }
-
-    $iconInfo = New-Object OpenScreenCursorInterop+ICONINFO
-    $hasIconInfo = [OpenScreenCursorInterop]::GetIconInfo($copiedHandle, [ref]$iconInfo)
-
-    try {
-        $icon = [System.Drawing.Icon]::FromHandle($copiedHandle)
-        $bitmap = New-Object System.Drawing.Bitmap $icon.Width, $icon.Height, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
-        $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
-        $memoryStream = New-Object System.IO.MemoryStream
-
-        try {
-            $graphics.Clear([System.Drawing.Color]::Transparent)
-            $graphics.DrawIcon($icon, 0, 0)
-            $bitmap.Save($memoryStream, [System.Drawing.Imaging.ImageFormat]::Png)
-            $base64 = [System.Convert]::ToBase64String($memoryStream.ToArray())
-
-            return @{
-                id = $cursorId
-                imageDataUrl = "data:image/png;base64,$base64"
-                width = $bitmap.Width
-                height = $bitmap.Height
-                hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
-                hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
-            }
-        }
-        finally {
-            $memoryStream.Dispose()
-            $graphics.Dispose()
-            $bitmap.Dispose()
-            $icon.Dispose()
-        }
-    }
-    finally {
-        if ($hasIconInfo) {
-            if ($iconInfo.hbmMask -ne [IntPtr]::Zero) {
-                [OpenScreenCursorInterop]::DeleteObject($iconInfo.hbmMask) | Out-Null
-            }
-            if ($iconInfo.hbmColor -ne [IntPtr]::Zero) {
-                [OpenScreenCursorInterop]::DeleteObject($iconInfo.hbmColor) | Out-Null
-            }
-        }
-        [OpenScreenCursorInterop]::DestroyIcon($copiedHandle) | Out-Null
-    }
-}
-
-Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
-
-$lastCursorId = $null
-while ($true) {
-    $cursorInfo = New-Object OpenScreenCursorInterop+CURSORINFO
-    $cursorInfo.cbSize = [Runtime.InteropServices.Marshal]::SizeOf([type][OpenScreenCursorInterop+CURSORINFO])
-
-    if (-not [OpenScreenCursorInterop]::GetCursorInfo([ref]$cursorInfo)) {
-        Write-JsonLine @{ type = 'error'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds(); message = 'GetCursorInfo failed' }
-        Start-Sleep -Milliseconds ${sampleIntervalMs}
-        continue
-    }
-
-    $visible = ($cursorInfo.flags -band 1) -ne 0
-    $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
-    $asset = $null
-
-    if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
-        $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
-        $lastCursorId = $cursorId
-    }
-
-    Write-JsonLine @{
-        type = 'sample'
-        timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()
-        x = $cursorInfo.ptScreenPos.X
-        y = $cursorInfo.ptScreenPos.Y
-        visible = $visible
-        handle = $cursorId
-        asset = $asset
-    }
+const READY_TIMEOUT_MS = 5_000;
 
-    Start-Sleep -Milliseconds ${sampleIntervalMs}
-}
-`;
-
-	return Buffer.from(script, "utf16le").toString("base64");
+interface NormalizedSample {
+	sample: CursorRecordingSample;
+	withinBounds: boolean;
 }
 
 export class WindowsNativeRecordingSession implements CursorRecordingSession {
@@ -209,6 +26,11 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 	private process: ChildProcessByStdio<null, Readable, Readable> | null = null;
 	private lineBuffer = "";
 	private startTimeMs = 0;
+	private readyResolve: (() => void) | null = null;
+	private readyReject: ((error: Error) => void) | null = null;
+	private readyTimer: NodeJS.Timeout | null = null;
+	private sampleCount = 0;
+	private outOfBoundsSampleCount = 0;
 
 	constructor(private readonly options: WindowsNativeRecordingSessionOptions) {}
 
@@ -217,8 +39,13 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		this.samples = [];
 		this.lineBuffer = "";
 		this.startTimeMs = Date.now();
+		this.sampleCount = 0;
+		this.outOfBoundsSampleCount = 0;
 
-		const encodedCommand = buildPowerShellCommand(this.options.sampleIntervalMs);
+		const encodedCommand = buildPowerShellCommand(
+			this.options.sampleIntervalMs,
+			parseWindowHandleFromSourceId(this.options.sourceId),
+		);
 		const child = spawn(
 			"powershell.exe",
 			[
@@ -237,24 +64,58 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		);
 
 		this.process = child;
+		this.logDiagnostic("spawn", {
+			pid: child.pid ?? null,
+			sampleIntervalMs: this.options.sampleIntervalMs,
+			sourceId: this.options.sourceId ?? null,
+			windowHandle: parseWindowHandleFromSourceId(this.options.sourceId),
+		});
+
 		child.stdout.setEncoding("utf8");
 		child.stdout.on("data", (chunk: string) => {
 			this.handleStdoutChunk(chunk);
 		});
 		child.stderr.setEncoding("utf8");
 		child.stderr.on("data", (chunk: string) => {
-			console.error("[cursor-native]", chunk.trim());
+			const message = chunk.trim();
+			if (message) {
+				this.logDiagnostic("stderr", { message });
+			}
+			console.error("[cursor-native]", message);
+		});
+		child.once("exit", (code, signal) => {
+			this.logDiagnostic("exit", {
+				code,
+				signal,
+				sampleCount: this.sampleCount,
+				assetCount: this.assets.size,
+				outOfBoundsSampleCount: this.outOfBoundsSampleCount,
+			});
+			this.rejectReady(new Error(`Windows cursor helper exited before ready (code=${code}, signal=${signal})`));
+		});
+		child.once("error", (error) => {
+			this.logDiagnostic("process-error", { message: error.message });
+			this.rejectReady(error);
 		});
+
+		await this.waitUntilReady();
 	}
 
 	async stop(): Promise<CursorRecordingData> {
 		const child = this.process;
 		this.process = null;
+		this.clearReadyState();
 
 		if (child && !child.killed) {
 			child.kill();
 		}
 
+		this.logDiagnostic("stop", {
+			sampleCount: this.sampleCount,
+			assetCount: this.assets.size,
+			outOfBoundsSampleCount: this.outOfBoundsSampleCount,
+		});
+
 		return {
 			version: 2,
 			provider: this.assets.size > 0 ? "native" : "none",
@@ -285,11 +146,14 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 
 	private handleEvent(payload: WindowsCursorEvent) {
 		if (payload.type === "error") {
+			this.logDiagnostic("helper-error", { message: payload.message });
 			console.error("Windows cursor helper error:", payload.message);
 			return;
 		}
 
 		if (payload.type === "ready") {
+			this.logDiagnostic("ready", { timestampMs: payload.timestampMs });
+			this.resolveReady();
 			return;
 		}
 
@@ -305,22 +169,100 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 				hotspotY: payload.asset.hotspotY,
 				scaleFactor: assetDisplay.scaleFactor,
 			});
+			this.logDiagnostic("asset", {
+				id: payload.asset.id,
+				width: payload.asset.width,
+				height: payload.asset.height,
+				hotspotX: payload.asset.hotspotX,
+				hotspotY: payload.asset.hotspotY,
+				scaleFactor: assetDisplay.scaleFactor,
+			});
 		}
 
-		const bounds = this.options.getDisplayBounds() ?? screen.getPrimaryDisplay().bounds;
+		const normalized = this.normalizeSample(payload);
+		this.sampleCount += 1;
+		if (!normalized.withinBounds) {
+			this.outOfBoundsSampleCount += 1;
+		}
+
+		this.samples.push(normalized.sample);
+
+		if (this.samples.length > this.options.maxSamples) {
+			this.samples.shift();
+		}
+	}
+
+	private normalizeSample(payload: Extract<WindowsCursorEvent, { type: "sample" }>): NormalizedSample {
+		const bounds = payload.bounds ?? this.options.getDisplayBounds() ?? screen.getPrimaryDisplay().bounds;
 		const width = Math.max(1, bounds.width);
 		const height = Math.max(1, bounds.height);
+		const normalizedX = (payload.x - bounds.x) / width;
+		const normalizedY = (payload.y - bounds.y) / height;
+		const withinBounds = normalizedX >= 0 && normalizedX <= 1 && normalizedY >= 0 && normalizedY <= 1;
+
+		if (this.sampleCount === 0 || (!withinBounds && this.outOfBoundsSampleCount === 0)) {
+			this.logDiagnostic("sample", {
+				rawX: payload.x,
+				rawY: payload.y,
+				normalizedX,
+				normalizedY,
+				visible: payload.visible,
+				withinBounds,
+				bounds,
+				handle: payload.handle,
+			});
+		}
+
+		return {
+			withinBounds,
+			sample: {
+				timeMs: Math.max(0, payload.timestampMs - this.startTimeMs),
+				cx: normalizedX,
+				cy: normalizedY,
+				assetId: payload.handle,
+				visible: payload.visible && withinBounds,
+			},
+		};
+	}
 
-		this.samples.push({
-			timeMs: Math.max(0, payload.timestampMs - this.startTimeMs),
-			cx: clamp((payload.x - bounds.x) / width, 0, 1),
-			cy: clamp((payload.y - bounds.y) / height, 0, 1),
-			assetId: payload.handle,
-			visible: payload.visible,
+	private waitUntilReady() {
+		return new Promise<void>((resolve, reject) => {
+			this.readyResolve = resolve;
+			this.readyReject = reject;
+			this.readyTimer = setTimeout(() => {
+				this.rejectReady(new Error("Timed out waiting for Windows cursor helper readiness"));
+			}, READY_TIMEOUT_MS);
 		});
+	}
 
-		if (this.samples.length > this.options.maxSamples) {
-			this.samples.shift();
+	private resolveReady() {
+		const resolve = this.readyResolve;
+		this.clearReadyState();
+		resolve?.();
+	}
+
+	private rejectReady(error: Error) {
+		const reject = this.readyReject;
+		this.clearReadyState();
+		reject?.(error);
+	}
+
+	private clearReadyState() {
+		if (this.readyTimer) {
+			clearTimeout(this.readyTimer);
+			this.readyTimer = null;
 		}
+		this.readyResolve = null;
+		this.readyReject = null;
+	}
+
+	private logDiagnostic(event: string, data: Record<string, unknown>) {
+		console.info(
+			"[cursor-native][win32]",
+			JSON.stringify({
+				event,
+				...data,
+			}),
+		);
 	}
 }
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
new file mode 100644
index 000000000..6efd59d24
--- /dev/null
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -0,0 +1,49 @@
+import type { Rectangle } from "electron";
+
+export interface WindowsCursorSampleEvent {
+	type: "sample";
+	timestampMs: number;
+	x: number;
+	y: number;
+	visible: boolean;
+	handle: string | null;
+	bounds?: {
+		x: number;
+		y: number;
+		width: number;
+		height: number;
+	} | null;
+	asset?: WindowsCursorAssetPayload;
+}
+
+export interface WindowsCursorReadyEvent {
+	type: "ready";
+	timestampMs: number;
+}
+
+export interface WindowsCursorErrorEvent {
+	type: "error";
+	timestampMs: number;
+	message: string;
+}
+
+export interface WindowsCursorAssetPayload {
+	id: string;
+	imageDataUrl: string;
+	width: number;
+	height: number;
+	hotspotX: number;
+	hotspotY: number;
+}
+
+export type WindowsCursorEvent =
+	| WindowsCursorSampleEvent
+	| WindowsCursorReadyEvent
+	| WindowsCursorErrorEvent;
+
+export interface WindowsNativeRecordingSessionOptions {
+	getDisplayBounds: () => Rectangle | null;
+	maxSamples: number;
+	sampleIntervalMs: number;
+	sourceId?: string | null;
+}
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 546ffcc91..96e6bd955 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -251,6 +251,8 @@ export function LaunchWindow() {
 
 	const [selectedSource, setSelectedSource] = useState("Screen");
 	const [hasSelectedSource, setHasSelectedSource] = useState(false);
+	const [, setHudPointerDownCount] = useState(0);
+	const [, setRecordPointerDownCount] = useState(0);
 
 	useEffect(() => {
 		const checkSelectedSource = async () => {
@@ -321,6 +323,9 @@ export function LaunchWindow() {
 		// recording toolbar widened (issue #305).
 		<div
 			className={`h-full w-full min-w-0 max-w-full overflow-x-hidden overflow-y-hidden bg-transparent ${styles.electronDrag}`}
+			onPointerDown={() => {
+				setHudPointerDownCount((count) => count + 1);
+			}}
 		>
 			{systemLocaleSuggestion && (
 				<div
@@ -523,6 +528,9 @@ export function LaunchWindow() {
 						onClick={toggleMicrophone}
 						disabled={recording}
 						title={microphoneEnabled ? t("audio.disableMicrophone") : t("audio.enableMicrophone")}
+						onPointerDown={() => {
+							setRecordPointerDownCount((count) => count + 1);
+						}}
 					>
 						{microphoneEnabled
 							? getIcon("micOn", "text-green-400")
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 77378fbe4..110a615a3 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -1401,6 +1401,7 @@ export default function VideoEditor() {
 						videoPadding: padding,
 						cropRegion,
 						cursorRecordingData,
+						cursorScale: showCursor ? cursorSize : 0,
 						annotationRegions,
 						webcamLayoutPreset,
 						webcamMaskShape,
@@ -1544,6 +1545,7 @@ export default function VideoEditor() {
 						padding,
 						cropRegion,
 						cursorRecordingData,
+						cursorScale: showCursor ? cursorSize : 0,
 						annotationRegions,
 						webcamLayoutPreset,
 						webcamMaskShape,
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index d73472630..a1de3bb5f 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -29,8 +29,9 @@ import { classifyWallpaper, DEFAULT_WALLPAPER, resolveImageWallpaperUrl } from "
 import { getCssClipPath } from "@/lib/webcamMaskShapes";
 import {
 	getNativeCursorDisplayMetrics,
+	hasNativeCursorRecordingData,
 	projectNativeCursorToStage,
-	resolveActiveNativeCursorFrame,
+	resolveInterpolatedNativeCursorFrame,
 } from "@/lib/cursor/nativeCursor";
 import type { CursorRecordingData } from "@/native/contracts";
 import {
@@ -311,44 +312,16 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const durationResolutionTimeoutRef = useRef<number | null>(null);
 		const lastResolvedDurationRef = useRef<number | null>(null);
 		const isResolvingDurationRef = useRef(false);
-
-		const activeNativeCursor = useMemo(
-			() => resolveActiveNativeCursorFrame(cursorRecordingData, currentTime * 1000),
-			[cursorRecordingData, currentTime],
+		const hasNativeCursorRecordingRef = useRef(false);
+		const cursorRecordingDataRef = useRef(cursorRecordingData);
+		const cropRegionRef = useRef(cropRegion);
+		const nativeCursorImgRef = useRef<HTMLImageElement | null>(null);
+
+		const hasNativeCursorRecording = useMemo(
+			() => hasNativeCursorRecordingData(cursorRecordingData),
+			[cursorRecordingData],
 		);
 
-		const nativeCursorStyle = useMemo(() => {
-			if (!activeNativeCursor || !cameraContainerRef.current || !videoContainerRef.current) {
-				return null;
-			}
-
-			const projectedPoint = projectNativeCursorToStage({
-				cameraContainer: cameraContainerRef.current,
-				cropRegion: cropRegion ?? { x: 0, y: 0, width: 1, height: 1 },
-				maskRect: baseMaskRef.current,
-				videoContainerPosition: {
-					x: videoContainerRef.current.x,
-					y: videoContainerRef.current.y,
-				},
-				sample: activeNativeCursor.sample,
-			});
-			if (!projectedPoint) {
-				return null;
-			}
-
-			const metrics = getNativeCursorDisplayMetrics(
-				activeNativeCursor.asset,
-				window.devicePixelRatio || 1,
-			);
-
-			return {
-				left: projectedPoint.x - metrics.hotspotX,
-				top: projectedPoint.y - metrics.hotspotY,
-				width: metrics.width,
-				height: metrics.height,
-			};
-		}, [activeNativeCursor, cropRegion, currentTime]);
-
 		const syncResolvedDuration = useCallback(
 			(video: HTMLVideoElement) => {
 				const resolvedDuration = getResolvedVideoDuration(video);
@@ -775,6 +748,18 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			showCursorRef.current = showCursor;
 		}, [showCursor]);
 
+		useEffect(() => {
+			hasNativeCursorRecordingRef.current = hasNativeCursorRecording;
+		}, [hasNativeCursorRecording]);
+
+		useEffect(() => {
+			cursorRecordingDataRef.current = cursorRecordingData;
+		}, [cursorRecordingData]);
+
+		useEffect(() => {
+			cropRegionRef.current = cropRegion;
+		}, [cropRegion]);
+
 		useEffect(() => {
 			cursorSizeRef.current = cursorSize;
 		}, [cursorSize]);
@@ -1413,16 +1398,69 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				// Update cursor overlay
 				const cursorOverlay = cursorOverlayRef.current;
 				if (cursorOverlay) {
-					const timeMs = currentTimeRef.current;
+					const timeMs = currentTimeRef.current; // already in ms
 					cursorOverlay.update(
 						cursorTelemetryRef.current,
 						timeMs,
 						baseMaskRef.current,
-						showCursorRef.current,
+						showCursorRef.current && !hasNativeCursorRecordingRef.current,
 						!isPlayingRef.current || isSeekingRef.current,
 					);
 				}
 
+				// Update native cursor image position at ticker rate (60fps)
+				const nativeCursorImg = nativeCursorImgRef.current;
+				if (nativeCursorImg) {
+					const cameraContainerRc = cameraContainerRef.current;
+					const videoContainerRc = videoContainerRef.current;
+					if (
+						hasNativeCursorRecordingRef.current &&
+						showCursorRef.current &&
+						cameraContainerRc &&
+						videoContainerRc
+					) {
+						const timeMs = currentTimeRef.current; // already in ms
+						const frame = resolveInterpolatedNativeCursorFrame(
+							cursorRecordingDataRef.current,
+							timeMs,
+						);
+						if (frame) {
+							const projectedPoint = projectNativeCursorToStage({
+								cameraContainer: cameraContainerRc,
+								cropRegion: cropRegionRef.current ?? { x: 0, y: 0, width: 1, height: 1 },
+								maskRect: baseMaskRef.current,
+								videoContainerPosition: {
+									x: videoContainerRc.x,
+									y: videoContainerRc.y,
+								},
+								sample: frame.sample,
+							});
+							if (projectedPoint) {
+								const metrics = getNativeCursorDisplayMetrics(
+									frame.asset,
+									window.devicePixelRatio || 1,
+								);
+								const scale = Math.max(0, cursorSizeRef.current);
+								if (nativeCursorImg.dataset.cursorId !== frame.asset.id) {
+									nativeCursorImg.src = frame.asset.imageDataUrl;
+									nativeCursorImg.dataset.cursorId = frame.asset.id;
+								}
+								nativeCursorImg.style.left = `${projectedPoint.x - metrics.hotspotX * scale}px`;
+								nativeCursorImg.style.top = `${projectedPoint.y - metrics.hotspotY * scale}px`;
+								nativeCursorImg.style.width = `${metrics.width * scale}px`;
+								nativeCursorImg.style.height = `${metrics.height * scale}px`;
+								nativeCursorImg.style.display = "block";
+							} else {
+								nativeCursorImg.style.display = "none";
+							}
+						} else {
+							nativeCursorImg.style.display = "none";
+						}
+					} else {
+						nativeCursorImg.style.display = "none";
+					}
+				}
+
 				const composite3D = composite3DRef.current;
 				const outerWrapper = outerWrapperRef.current;
 				if (composite3D && outerWrapper) {
@@ -1711,17 +1749,14 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 								className="absolute rounded-md border border-[#34B27B]/80 bg-[#34B27B]/20 shadow-[0_0_0_1px_rgba(52,178,123,0.35)]"
 								style={{ display: "none", pointerEvents: "none" }}
 							/>
-							{activeNativeCursor && nativeCursorStyle ? (
+							{hasNativeCursorRecording ? (
 								<img
+									ref={nativeCursorImgRef}
 									alt=""
 									aria-hidden="true"
-									src={activeNativeCursor.asset.imageDataUrl}
 									className="absolute select-none"
 									style={{
-										left: nativeCursorStyle.left,
-										top: nativeCursorStyle.top,
-										width: nativeCursorStyle.width,
-										height: nativeCursorStyle.height,
+										display: "none",
 										pointerEvents: "none",
 										userSelect: "none",
 									}}
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 9401b9c8d..bb9c5881c 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -25,7 +25,6 @@ const CODEC_ALIGNMENT = 2;
 
 const RECORDER_TIMESLICE_MS = 1000;
 const BITS_PER_MEGABIT = 1_000_000;
-const CHROME_MEDIA_SOURCE = "desktop";
 const RECORDING_FILE_PREFIX = "recording-";
 const VIDEO_FILE_EXTENSION = ".webm";
 const WEBCAM_FILE_SUFFIX = "-webcam";
@@ -576,42 +575,19 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 
 			let screenMediaStream: MediaStream;
 
-			const videoConstraints = {
-				mandatory: {
-					chromeMediaSource: CHROME_MEDIA_SOURCE,
-					chromeMediaSourceId: selectedSource.id,
-					maxWidth: TARGET_WIDTH,
-					maxHeight: TARGET_HEIGHT,
-					maxFrameRate: TARGET_FRAME_RATE,
-					minFrameRate: MIN_FRAME_RATE,
-				},
-			};
-
-			if (systemAudioEnabled) {
-				try {
-					screenMediaStream = await navigator.mediaDevices.getUserMedia({
-						audio: {
-							mandatory: {
-								chromeMediaSource: CHROME_MEDIA_SOURCE,
-								chromeMediaSourceId: selectedSource.id,
-							},
-						},
-						video: videoConstraints,
-					} as unknown as MediaStreamConstraints);
-				} catch (audioErr) {
-					console.warn("System audio capture failed, falling back to video-only:", audioErr);
-					toast.error(t("recording.systemAudioUnavailable"));
-					screenMediaStream = await navigator.mediaDevices.getUserMedia({
-						audio: false,
-						video: videoConstraints,
-					} as unknown as MediaStreamConstraints);
-				}
-			} else {
-				screenMediaStream = await navigator.mediaDevices.getUserMedia({
-					audio: false,
-					video: videoConstraints,
-				} as unknown as MediaStreamConstraints);
-			}
+			// getDisplayMedia + setDisplayMediaRequestHandler (main.ts) supplies the
+			// pre-selected source and honors cursor:"never" to exclude the system cursor
+			// from every captured frame. System audio is provided via WASAPI loopback
+			// on Windows when the user has enabled it.
+			screenMediaStream = await navigator.mediaDevices.getDisplayMedia({
+				video: {
+					cursor: "never",
+					width: { max: TARGET_WIDTH },
+					height: { max: TARGET_HEIGHT },
+					frameRate: { ideal: TARGET_FRAME_RATE, min: MIN_FRAME_RATE },
+				} as MediaTrackConstraints,
+				audio: systemAudioEnabled,
+			} as DisplayMediaStreamOptions);
 			screenStream.current = screenMediaStream;
 
 			if (!isCountdownRunActive(countdownRunToken)) {
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 23e187bea..b32bd9e04 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -14,7 +14,7 @@ export interface ActiveNativeCursorFrame {
 interface ProjectNativeCursorOptions {
 	cameraContainer: Container;
 	cropRegion: CropRegion;
-	maskRect: { width: number; height: number };
+	maskRect: { x: number; y: number; width: number; height: number };
 	videoContainerPosition: { x: number; y: number };
 	sample: CursorRecordingSample;
 }
@@ -23,6 +23,17 @@ function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
+export function hasNativeCursorRecordingData(
+	recordingData: CursorRecordingData | null | undefined,
+): recordingData is CursorRecordingData {
+	return Boolean(
+		recordingData &&
+			recordingData.provider === "native" &&
+			recordingData.samples.length > 0 &&
+			recordingData.assets.length > 0,
+	);
+}
+
 function getCroppedCursorPosition(sample: CursorRecordingSample, cropRegion: CropRegion) {
 	if (cropRegion.width <= 0 || cropRegion.height <= 0) {
 		return null;
@@ -45,7 +56,7 @@ export function resolveActiveNativeCursorFrame(
 	recordingData: CursorRecordingData | null | undefined,
 	timeMs: number,
 ): ActiveNativeCursorFrame | null {
-	if (!recordingData || recordingData.provider !== "native" || recordingData.assets.length === 0) {
+	if (!hasNativeCursorRecordingData(recordingData)) {
 		return null;
 	}
 
@@ -70,6 +81,65 @@ export function resolveActiveNativeCursorFrame(
 	return null;
 }
 
+export function resolveInterpolatedNativeCursorFrame(
+	recordingData: CursorRecordingData | null | undefined,
+	timeMs: number,
+): ActiveNativeCursorFrame | null {
+	if (!hasNativeCursorRecordingData(recordingData)) {
+		return null;
+	}
+
+	const samples = recordingData.samples;
+	let activeIndex = -1;
+
+	for (let index = samples.length - 1; index >= 0; index -= 1) {
+		if (samples[index].timeMs <= timeMs) {
+			activeIndex = index;
+			break;
+		}
+	}
+
+	if (activeIndex < 0) {
+		return null;
+	}
+
+	const activeSample = samples[activeIndex];
+	if (activeSample.visible === false || !activeSample.assetId) {
+		return null;
+	}
+
+	const asset = recordingData.assets.find((candidate) => candidate.id === activeSample.assetId);
+	if (!asset) {
+		return null;
+	}
+
+	const nextSample = samples[activeIndex + 1];
+	if (
+		!nextSample ||
+		nextSample.timeMs <= activeSample.timeMs ||
+		nextSample.visible === false ||
+		nextSample.assetId !== activeSample.assetId ||
+		timeMs <= activeSample.timeMs
+	) {
+		return { asset, sample: activeSample };
+	}
+
+	const interpolation = clamp(
+		(timeMs - activeSample.timeMs) / (nextSample.timeMs - activeSample.timeMs),
+		0,
+		1,
+	);
+
+	return {
+		asset,
+		sample: {
+			...activeSample,
+			cx: activeSample.cx + (nextSample.cx - activeSample.cx) * interpolation,
+			cy: activeSample.cy + (nextSample.cy - activeSample.cy) * interpolation,
+		},
+	};
+}
+
 export function projectNativeCursorToStage({
 	cameraContainer,
 	cropRegion,
@@ -83,8 +153,8 @@ export function projectNativeCursorToStage({
 	}
 
 	const localPoint = new Point(
-		videoContainerPosition.x + croppedPosition.cx * maskRect.width,
-		videoContainerPosition.y + croppedPosition.cy * maskRect.height,
+		videoContainerPosition.x + maskRect.x + croppedPosition.cx * maskRect.width,
+		videoContainerPosition.y + maskRect.y + croppedPosition.cy * maskRect.height,
 	);
 
 	return cameraContainer.toGlobal(localPoint);
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index 429203972..8b87538c0 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -60,7 +60,7 @@ import {
 import {
 	getNativeCursorDisplayMetrics,
 	projectNativeCursorToStage,
-	resolveActiveNativeCursorFrame,
+	resolveInterpolatedNativeCursorFrame,
 } from "@/lib/cursor/nativeCursor";
 import { BackgroundLoadError, classifyWallpaper, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { drawCanvasClipPath } from "@/lib/webcamMaskShapes";
@@ -87,6 +87,7 @@ interface FrameRenderConfig {
 	padding?: number;
 	cropRegion: CropRegion;
 	cursorRecordingData?: CursorRecordingData | null;
+	cursorScale?: number;
 	videoWidth: number;
 	videoHeight: number;
 	webcamSize?: Size | null;
@@ -559,7 +560,11 @@ export class FrameRenderer {
 			return;
 		}
 
-		const activeNativeCursor = resolveActiveNativeCursorFrame(
+		if ((this.config.cursorScale ?? 1) <= 0) {
+			return;
+		}
+
+		const activeNativeCursor = resolveInterpolatedNativeCursorFrame(
 			this.config.cursorRecordingData,
 			timeMs,
 		);
@@ -583,13 +588,13 @@ export class FrameRenderer {
 
 		const image = await this.getCursorImage(activeNativeCursor.asset);
 		const metrics = getNativeCursorDisplayMetrics(activeNativeCursor.asset, 1);
-
+		const scale = Math.max(0, this.config.cursorScale ?? 1);
 		this.compositeCtx.drawImage(
 			image,
-			projectedPoint.x - metrics.hotspotX,
-			projectedPoint.y - metrics.hotspotY,
-			metrics.width,
-			metrics.height,
+			projectedPoint.x - metrics.hotspotX * scale,
+			projectedPoint.y - metrics.hotspotY * scale,
+			metrics.width * scale,
+			metrics.height * scale,
 		);
 	}
 
diff --git a/src/lib/exporter/gifExporter.ts b/src/lib/exporter/gifExporter.ts
index 02564db45..c1120afda 100644
--- a/src/lib/exporter/gifExporter.ts
+++ b/src/lib/exporter/gifExporter.ts
@@ -49,6 +49,7 @@ interface GifExporterConfig {
 	webcamSizePreset?: WebcamSizePreset;
 	webcamPosition?: { cx: number; cy: number } | null;
 	cursorRecordingData?: CursorRecordingData | null;
+	cursorScale?: number;
 	annotationRegions?: AnnotationRegion[];
 	previewWidth?: number;
 	previewHeight?: number;
@@ -154,6 +155,7 @@ export class GifExporter {
 				padding: this.config.padding,
 				cropRegion: this.config.cropRegion,
 				cursorRecordingData: this.config.cursorRecordingData,
+				cursorScale: this.config.cursorScale,
 				videoWidth: videoInfo.width,
 				videoHeight: videoInfo.height,
 				webcamSize: webcamInfo ? { width: webcamInfo.width, height: webcamInfo.height } : null,
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index edddd05b5..fb386118c 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -40,6 +40,7 @@ interface VideoExporterConfig extends ExportConfig {
 	webcamSizePreset?: WebcamSizePreset;
 	webcamPosition?: { cx: number; cy: number } | null;
 	cursorRecordingData?: CursorRecordingData | null;
+	cursorScale?: number;
 	annotationRegions?: AnnotationRegion[];
 	previewWidth?: number;
 	previewHeight?: number;
@@ -149,6 +150,7 @@ export class VideoExporter {
 				padding: this.config.padding,
 				cropRegion: this.config.cropRegion,
 				cursorRecordingData: this.config.cursorRecordingData,
+				cursorScale: this.config.cursorScale,
 				videoWidth: videoInfo.width,
 				videoHeight: videoInfo.height,
 				webcamSize: webcamInfo ? { width: webcamInfo.width, height: webcamInfo.height } : null,

From c8bf3f7dfc91483c433e9541381822aa9aaaa666 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Sun, 3 May 2026 16:53:04 +0200
Subject: [PATCH 05/38] fix: restore cursor pipeline build after rebase

---
 .gitignore                                    |  3 ++
 electron/ipc/handlers.ts                      | 44 ++++++++++++++++++-
 electron/preload.ts                           |  1 +
 src/components/video-editor/SettingsPanel.tsx |  2 -
 src/components/video-editor/VideoEditor.tsx   | 18 ++++++--
 src/components/video-editor/VideoPlayback.tsx |  4 +-
 src/hooks/useScreenRecorder.ts                |  3 +-
 src/lib/exporter/frameRenderer.ts             |  2 +-
 8 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 771c4bd5d..494da3066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ __screenshots__/
 result
 result-*
 .direnv/
+
+#kilocode
+.kilo/
\ No newline at end of file
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 2a1b8302b..8793a492a 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -449,9 +449,12 @@ async function storeRecordedSessionFiles(payload: StoreRecordedSessionInput) {
 export function registerIpcHandlers(
 	createEditorWindow: () => void,
 	createSourceSelectorWindow: () => BrowserWindow,
+	_createCountdownOverlayWindow: () => BrowserWindow,
 	getMainWindow: () => BrowserWindow | null,
 	getSourceSelectorWindow: () => BrowserWindow | null,
+	_getCountdownOverlayWindow?: () => BrowserWindow | null,
 	onRecordingStateChange?: (recording: boolean, sourceName: string) => void,
+	_switchToHud?: () => void,
 ) {
 	ipcMain.handle("get-sources", async (_, opts) => {
 		const sources = await desktopCapturer.getSources(opts);
@@ -470,7 +473,7 @@ export function registerIpcHandlers(
 		// Reuse the exact source object returned during enumeration to avoid
 		// Windows window-source id mismatches across separate getSources() calls.
 		selectedDesktopSource =
-			typeof source.id === "string" ? lastEnumeratedSources.get(source.id) ?? null : null;
+			typeof source.id === "string" ? (lastEnumeratedSources.get(source.id) ?? null) : null;
 
 		if (!selectedDesktopSource && typeof source.id === "string") {
 			try {
@@ -558,6 +561,45 @@ export function registerIpcHandlers(
 		}
 	});
 
+	async function storeRecordedSessionFiles(payload: StoreRecordedSessionInput) {
+		const createdAt =
+			typeof payload.createdAt === "number" && Number.isFinite(payload.createdAt)
+				? payload.createdAt
+				: Date.now();
+		const screenVideoPath = path.join(RECORDINGS_DIR, payload.screen.fileName);
+		await fs.writeFile(screenVideoPath, Buffer.from(payload.screen.videoData));
+
+		let webcamVideoPath: string | undefined;
+		if (payload.webcam) {
+			webcamVideoPath = path.join(RECORDINGS_DIR, payload.webcam.fileName);
+			await fs.writeFile(webcamVideoPath, Buffer.from(payload.webcam.videoData));
+		}
+
+		const session: RecordingSession = webcamVideoPath
+			? { screenVideoPath, webcamVideoPath, createdAt }
+			: { screenVideoPath, createdAt };
+		setCurrentRecordingSessionState(session);
+		currentVideoPath = screenVideoPath;
+		currentProjectPath = null;
+
+		const telemetryPath = `${screenVideoPath}.cursor.json`;
+		if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
+			await fs.writeFile(
+				telemetryPath,
+				JSON.stringify(pendingCursorRecordingData, null, 2),
+				"utf-8",
+			);
+		}
+		pendingCursorRecordingData = null;
+
+		return {
+			success: true,
+			path: screenVideoPath,
+			session,
+			message: "Recording session stored successfully",
+		};
+	}
+
 	ipcMain.handle("store-recorded-video", async (_, videoData: ArrayBuffer, fileName: string) => {
 		try {
 			return await storeRecordedSessionFiles({
diff --git a/electron/preload.ts b/electron/preload.ts
index ddf56825d..1049bc982 100644
--- a/electron/preload.ts
+++ b/electron/preload.ts
@@ -1,4 +1,5 @@
 import { contextBridge, ipcRenderer } from "electron";
+import type { RecordingSession, StoreRecordedSessionInput } from "../src/lib/recordingSession";
 import { NATIVE_BRIDGE_CHANNEL, type NativeBridgeRequest } from "../src/native/contracts";
 
 // Asset base URL is passed from the main process via webPreferences.additionalArguments
diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsx
index c373bf9a9..58dc5894e 100644
--- a/src/components/video-editor/SettingsPanel.tsx
+++ b/src/components/video-editor/SettingsPanel.tsx
@@ -379,8 +379,6 @@ export function SettingsPanel({
 
 	const [selectedColor, setSelectedColor] = useState("#ADADAD");
 	const [gradient, setGradient] = useState<string>(GRADIENTS[0]);
-	const [showCropModal, setShowCropModal] = useState(false);
-	const cropSnapshotRef = useRef<CropRegion | null>(null);
 	const [cropAspectLocked, setCropAspectLocked] = useState(false);
 	const [cropAspectRatio, setCropAspectRatio] = useState("");
 	const isPortraitCanvas = isPortraitAspectRatio(aspectRatio);
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 110a615a3..509daa997 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -33,12 +33,12 @@ import type { ProjectMedia } from "@/lib/recordingSession";
 import { matchesShortcut } from "@/lib/shortcuts";
 import { loadUserPreferences, saveUserPreferences } from "@/lib/userPreferences";
 import { BackgroundLoadError } from "@/lib/wallpaper";
+import { nativeBridgeClient, useCursorRecordingData, useCursorTelemetry } from "@/native";
 import {
 	getAspectRatioValue,
 	getNativeAspectRatioValue,
 	isPortraitAspectRatio,
 } from "@/utils/aspectRatioUtils";
-import { nativeBridgeClient, useCursorRecordingData, useCursorTelemetry } from "@/native";
 import { ExportDialog } from "./ExportDialog";
 import PlaybackControls from "./PlaybackControls";
 import {
@@ -143,6 +143,13 @@ export default function VideoEditor() {
 	const [gifSizePreset, setGifSizePreset] = useState<GifSizePreset>("medium");
 	const [exportedFilePath, setExportedFilePath] = useState<string | null>(null);
 	const [lastSavedSnapshot, setLastSavedSnapshot] = useState<string | null>(null);
+	const [unsavedExport, setUnsavedExport] = useState<{
+		arrayBuffer: ArrayBuffer;
+		fileName: string;
+		format: string;
+	} | null>(null);
+	const [isFullscreen, setIsFullscreen] = useState(false);
+	const playerContainerRef = useRef<HTMLDivElement | null>(null);
 	const cursorTelemetrySourcePath = videoSourcePath ?? (videoPath ? fromFileUrl(videoPath) : null);
 	const { samples: cursorTelemetry, error: cursorTelemetryError } =
 		useCursorTelemetry(cursorTelemetrySourcePath);
@@ -208,7 +215,12 @@ export default function VideoEditor() {
 			}
 
 			const project = candidate;
-			const sourcePath = project.videoPath;
+			const projectMedia = resolveProjectMedia(project);
+			if (!projectMedia) {
+				return false;
+			}
+			const sourcePath = projectMedia.screenVideoPath;
+			const webcamSourcePath = projectMedia.webcamVideoPath ?? null;
 			const normalizedEditor = normalizeProjectEditor(project.editor);
 			const inferredDurationMs = Math.max(
 				0,
@@ -397,7 +409,7 @@ export default function VideoEditor() {
 					setVideoPath(toFileUrl(result.path));
 					setCurrentProjectPath(null);
 					setLastSavedSnapshot(
-						createProjectSnapshot({ screenVideoPath: sourcePath }, INITIAL_EDITOR_STATE),
+						createProjectSnapshot({ screenVideoPath: result.path }, INITIAL_EDITOR_STATE),
 					);
 				} else {
 					setError("No video to load. Please record or select a video.");
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index a1de3bb5f..442c04084 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -25,14 +25,14 @@ import {
 	type WebcamLayoutPreset,
 	type WebcamSizePreset,
 } from "@/lib/compositeLayout";
-import { classifyWallpaper, DEFAULT_WALLPAPER, resolveImageWallpaperUrl } from "@/lib/wallpaper";
-import { getCssClipPath } from "@/lib/webcamMaskShapes";
 import {
 	getNativeCursorDisplayMetrics,
 	hasNativeCursorRecordingData,
 	projectNativeCursorToStage,
 	resolveInterpolatedNativeCursorFrame,
 } from "@/lib/cursor/nativeCursor";
+import { classifyWallpaper, DEFAULT_WALLPAPER, resolveImageWallpaperUrl } from "@/lib/wallpaper";
+import { getCssClipPath } from "@/lib/webcamMaskShapes";
 import type { CursorRecordingData } from "@/native/contracts";
 import {
 	type AspectRatio,
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index bb9c5881c..d710a6051 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -1,7 +1,8 @@
 import { fixWebmDuration } from "@fix-webm-duration/fix";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
-import { nativeBridgeClient } from "@/native";
+import { useScopedT } from "@/contexts/I18nContext";
+import { requestCameraAccess } from "@/lib/requestCameraAccess";
 
 const TARGET_FRAME_RATE = 60;
 const MIN_FRAME_RATE = 30;
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index 8b87538c0..f954977ce 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -615,7 +615,7 @@ export class FrameRenderer {
 		return image;
 	}
 
-	private updateLayout(): void {
+	private updateLayout(webcamFrame?: VideoFrame | null): void {
 		if (!this.app || !this.videoSprite || !this.maskGraphics || !this.videoContainer) return;
 
 		const { width, height } = this.config;

From 73960d9eab8bee3b23d0a60474996dffe441e503 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 10:16:01 +0200
Subject: [PATCH 06/38] feat: add windows cursor preview diagnostics

---
 README.md                                     |    3 +
 docs/testing/windows-native-cursor.md         |   85 ++
 electron/ipc/handlers.ts                      |   16 +
 .../windowsNativeRecordingSession.script.ts   |   41 +-
 .../windowsNativeRecordingSession.ts          |   21 +-
 .../windowsNativeRecordingSession.types.ts    |    3 +
 package.json                                  |   12 +-
 scripts/capture-openscreen-preview.mjs        |  262 ++++
 scripts/test-windows-native-cursor.mjs        | 1113 +++++++++++++++++
 src/components/video-editor/VideoPlayback.tsx |   19 +-
 src/lib/cursor/nativeCursor.ts                |  128 ++
 src/lib/exporter/frameRenderer.ts             |   22 +-
 src/native/contracts.ts                       |   17 +
 13 files changed, 1713 insertions(+), 29 deletions(-)
 create mode 100644 docs/testing/windows-native-cursor.md
 create mode 100644 scripts/capture-openscreen-preview.mjs
 create mode 100644 scripts/test-windows-native-cursor.mjs

diff --git a/README.md b/README.md
index 9ed0d1a36..642779afb 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,9 @@ _I'm new to open source, idk what I'm doing lol. If something is wrong please ra
 See the documentation here:
 [OpenScreen Docs](https://deepwiki.com/siddharthvaddem/openscreen)
 
+Developer notes:
+- [Windows native cursor test pipeline](docs/testing/windows-native-cursor.md)
+
 ## Contributing
 
 Contributions are welcome! If you’d like to help out or see what’s currently being worked on, take a look at the open issues and the [project roadmap](https://github.com/users/siddharthvaddem/projects/3) to understand the current direction of the project and find ways to contribute.
diff --git a/docs/testing/windows-native-cursor.md b/docs/testing/windows-native-cursor.md
new file mode 100644
index 000000000..1abe04ec6
--- /dev/null
+++ b/docs/testing/windows-native-cursor.md
@@ -0,0 +1,85 @@
+# Windows native cursor test pipeline
+
+This branch includes two Windows-focused diagnostics for fast iteration on native cursor capture and rendering. They are intentionally local developer tools: they create short videos and JSON reports so cursor changes can be inspected without doing a full manual record/edit/export cycle.
+
+## Native sampler diagnostic
+
+```powershell
+npm run test:cursor-native:win
+```
+
+This script does not launch OpenScreen. It:
+
+- starts a Windows `GetCursorInfo` sampler
+- moves the real OS pointer with `SetCursorPos`
+- captures native cursor handles, hotspots, assets, and standard `IDC_*` cursor types
+- writes normalized `CursorRecordingData`
+- generates an abstract preview video
+- generates a real-screen preview video using screenshots of the current desktop
+
+The output directory is printed in the command result, for example:
+
+```text
+C:\Users\<user>\AppData\Local\Temp\openscreen-cursor-native-...
+```
+
+Useful files:
+
+- `report.json`: sample counts, asset counts, cursor handles, and generated artifact paths
+- `cursor-recording-data.json`: sidecar-compatible cursor data
+- `preview.webm`: abstract path/asset/hotspot preview
+- `real-capture-preview.webm`: real desktop screenshot background with reconstructed cursor overlay
+- `assets/*.png`: raw cursor bitmaps captured from Windows
+
+Environment overrides:
+
+```powershell
+$env:CURSOR_TEST_DURATION_MS = "3000"
+$env:CURSOR_TEST_SAMPLE_INTERVAL_MS = "16"
+$env:CURSOR_TEST_SCREEN_FRAME_INTERVAL_MS = "80"
+$env:CURSOR_TEST_OUTPUT_DIR = "C:\temp\openscreen-cursor-test"
+npm run test:cursor-native:win
+```
+
+## OpenScreen preview capture
+
+```powershell
+npm run capture:openscreen-preview
+```
+
+This script launches the real Electron app, injects a fixture video plus cursor sidecar data, opens the editor, captures frames from the actual OpenScreen preview UI, and encodes them into a WebM.
+
+By default it uses the latest `cursor-recording-data.json` generated by `npm run test:cursor-native:win`. To force a specific sidecar:
+
+```powershell
+$env:CURSOR_RECORDING_DATA_PATH = "C:\path\to\cursor-recording-data.json"
+npm run capture:openscreen-preview
+```
+
+Useful environment overrides:
+
+```powershell
+$env:OPENSCREEN_PREVIEW_SKIP_BUILD = "true"
+$env:OPENSCREEN_PREVIEW_FRAME_COUNT = "120"
+$env:OPENSCREEN_PREVIEW_FPS = "30"
+$env:OPENSCREEN_PREVIEW_OUTPUT_DIR = "C:\temp\openscreen-preview"
+npm run capture:openscreen-preview
+```
+
+Useful files:
+
+- `openscreen-preview.webm`: video of the real OpenScreen editor preview
+- `frames/*.png`: captured preview frames
+- `report.json`: fixture paths, source sidecar, frame count, and output path
+
+## What these tests validate
+
+Together, the scripts make it quick to inspect:
+
+- whether Windows cursor samples are visible and continuous
+- whether native hotspots stay anchored when scaling to `3x`
+- whether standard Windows cursors are recognized via `IDC_*`
+- whether high-quality SVG cursor replacements follow the native hotspot
+- whether the real OpenScreen preview renders the same cursor behavior as the diagnostic pipeline
+
+They are not a full substitute for an end-to-end manual recording pass. Before shipping cursor changes, also test a real capture session and export from the packaged app.
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 8793a492a..2694dc5e9 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -265,6 +265,7 @@ function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 		cy: typeof point.cy === "number" && Number.isFinite(point.cy) ? point.cy : 0.5,
 		assetId: typeof point.assetId === "string" ? point.assetId : null,
 		visible: typeof point.visible === "boolean" ? point.visible : true,
+		cursorType: typeof point.cursorType === "string" ? point.cursorType : null,
 	};
 }
 
@@ -303,6 +304,7 @@ function normalizeCursorAsset(asset: unknown): NativeCursorAsset | null {
 			typeof candidate.scaleFactor === "number" && Number.isFinite(candidate.scaleFactor)
 				? Math.max(0.1, candidate.scaleFactor)
 				: undefined,
+		cursorType: typeof candidate.cursorType === "string" ? candidate.cursorType : null,
 	};
 }
 
@@ -998,6 +1000,20 @@ export function registerIpcHandlers(
 		return setCurrentVideoPath(path);
 	});
 
+	ipcMain.handle("set-current-recording-session", (_, session: RecordingSession | null) => {
+		const normalizedSession = normalizeRecordingSession(session);
+		setCurrentRecordingSessionState(normalizedSession);
+		currentVideoPath = normalizedSession?.screenVideoPath ?? null;
+		currentProjectPath = null;
+		return { success: true, session: currentRecordingSession };
+	});
+
+	ipcMain.handle("get-current-recording-session", () => {
+		return currentRecordingSession
+			? { success: true, session: currentRecordingSession }
+			: { success: false };
+	});
+
 	function setCurrentVideoPath(path: string): ProjectPathResult {
 		currentVideoPath = normalizeVideoSourcePath(path) ?? path;
 		currentProjectPath = null;
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index b7a11cb46..5607134d0 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -16,7 +16,7 @@ export function buildPowerShellCommand(sampleIntervalMs: number, windowHandle?:
 $ErrorActionPreference = 'Stop'
 Add-Type -AssemblyName System.Drawing
 
-$targetWindowHandle = ${windowHandle ? `'${windowHandle}'` : '$null'}
+$targetWindowHandle = ${windowHandle ? `'${windowHandle}'` : "$null"}
 
 $source = @"
 using System;
@@ -59,6 +59,9 @@ public static class OpenScreenCursorInterop {
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetCursorInfo(ref CURSORINFO pci);
 
+	[DllImport("user32.dll", SetLastError = true)]
+	public static extern IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
+
 	[DllImport("user32.dll", SetLastError = true)]
 	[return: MarshalAs(UnmanagedType.Bool)]
 	public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
@@ -86,6 +89,37 @@ public static class OpenScreenCursorInterop {
 
 Add-Type -TypeDefinition $source
 
+$standardCursors = @{
+    arrow = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32512))
+    text = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32513))
+    wait = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32514))
+    crosshair = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32515))
+    'up-arrow' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32516))
+    'resize-nwse' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32642))
+    'resize-nesw' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32643))
+    'resize-ew' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32644))
+    'resize-ns' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32645))
+    move = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32646))
+    'not-allowed' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32648))
+    pointer = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32649))
+    'app-starting' = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32650))
+    help = [OpenScreenCursorInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32651))
+}
+
+function Get-StandardCursorType($cursorHandle) {
+    if ($cursorHandle -eq [IntPtr]::Zero) {
+        return $null
+    }
+
+    foreach ($entry in $standardCursors.GetEnumerator()) {
+        if ($entry.Value -eq $cursorHandle) {
+            return $entry.Key
+        }
+    }
+
+    return $null
+}
+
 function Write-JsonLine($payload) {
     [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
 }
@@ -190,10 +224,14 @@ while ($true) {
 
     $visible = ($cursorInfo.flags -band 1) -ne 0
     $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
+    $cursorType = Get-StandardCursorType $cursorInfo.hCursor
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
         $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
+        if ($asset -and $cursorType) {
+            $asset.cursorType = $cursorType
+        }
         $lastCursorId = $cursorId
     }
 
@@ -204,6 +242,7 @@ while ($true) {
         y = $cursorInfo.ptScreenPos.Y
         visible = $visible
         handle = $cursorId
+        cursorType = $cursorType
 		bounds = Get-TargetBounds
         asset = $asset
     }
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index d5e43d777..632a74d5e 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -7,7 +7,10 @@ import type {
 	NativeCursorAsset,
 } from "../../../../src/native/contracts";
 import type { CursorRecordingSession } from "./session";
-import { buildPowerShellCommand, parseWindowHandleFromSourceId } from "./windowsNativeRecordingSession.script";
+import {
+	buildPowerShellCommand,
+	parseWindowHandleFromSourceId,
+} from "./windowsNativeRecordingSession.script";
 import type {
 	WindowsCursorEvent,
 	WindowsNativeRecordingSessionOptions,
@@ -91,7 +94,9 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 				assetCount: this.assets.size,
 				outOfBoundsSampleCount: this.outOfBoundsSampleCount,
 			});
-			this.rejectReady(new Error(`Windows cursor helper exited before ready (code=${code}, signal=${signal})`));
+			this.rejectReady(
+				new Error(`Windows cursor helper exited before ready (code=${code}, signal=${signal})`),
+			);
 		});
 		child.once("error", (error) => {
 			this.logDiagnostic("process-error", { message: error.message });
@@ -168,6 +173,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 				hotspotX: payload.asset.hotspotX,
 				hotspotY: payload.asset.hotspotY,
 				scaleFactor: assetDisplay.scaleFactor,
+				cursorType: payload.asset.cursorType ?? payload.cursorType ?? null,
 			});
 			this.logDiagnostic("asset", {
 				id: payload.asset.id,
@@ -192,13 +198,17 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		}
 	}
 
-	private normalizeSample(payload: Extract<WindowsCursorEvent, { type: "sample" }>): NormalizedSample {
-		const bounds = payload.bounds ?? this.options.getDisplayBounds() ?? screen.getPrimaryDisplay().bounds;
+	private normalizeSample(
+		payload: Extract<WindowsCursorEvent, { type: "sample" }>,
+	): NormalizedSample {
+		const bounds =
+			payload.bounds ?? this.options.getDisplayBounds() ?? screen.getPrimaryDisplay().bounds;
 		const width = Math.max(1, bounds.width);
 		const height = Math.max(1, bounds.height);
 		const normalizedX = (payload.x - bounds.x) / width;
 		const normalizedY = (payload.y - bounds.y) / height;
-		const withinBounds = normalizedX >= 0 && normalizedX <= 1 && normalizedY >= 0 && normalizedY <= 1;
+		const withinBounds =
+			normalizedX >= 0 && normalizedX <= 1 && normalizedY >= 0 && normalizedY <= 1;
 
 		if (this.sampleCount === 0 || (!withinBounds && this.outOfBoundsSampleCount === 0)) {
 			this.logDiagnostic("sample", {
@@ -221,6 +231,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 				cy: normalizedY,
 				assetId: payload.handle,
 				visible: payload.visible && withinBounds,
+				cursorType: payload.cursorType ?? payload.asset?.cursorType ?? null,
 			},
 		};
 	}
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
index 6efd59d24..fdc4ab93a 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -1,4 +1,5 @@
 import type { Rectangle } from "electron";
+import type { NativeCursorType } from "../../../../src/native/contracts";
 
 export interface WindowsCursorSampleEvent {
 	type: "sample";
@@ -7,6 +8,7 @@ export interface WindowsCursorSampleEvent {
 	y: number;
 	visible: boolean;
 	handle: string | null;
+	cursorType?: NativeCursorType | null;
 	bounds?: {
 		x: number;
 		y: number;
@@ -34,6 +36,7 @@ export interface WindowsCursorAssetPayload {
 	height: number;
 	hotspotX: number;
 	hotspotY: number;
+	cursorType?: NativeCursorType | null;
 }
 
 export type WindowsCursorEvent =
diff --git a/package.json b/package.json
index 546108c8b..1826a8697 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,14 @@
 		"lint:fix": "biome check --write .",
 		"format": "biome format --write .",
 		"i18n:check": "node scripts/i18n-check.mjs",
-		"preview": "vite preview",
-		"build:mac": "tsc && vite build && electron-builder --mac",
-		"build:win": "tsc && vite build && electron-builder --win --config.npmRebuild=false",
-		"build:linux": "tsc && vite build && electron-builder --linux AppImage deb pacman --config.npmRebuild=false",
-		"test": "vitest --run",
+	"preview": "vite preview",
+	"build:mac": "tsc && vite build && electron-builder --mac",
+	"build:win": "tsc && vite build && electron-builder --win --config.npmRebuild=false",
+	"build:linux": "tsc && vite build && electron-builder --linux AppImage deb pacman --config.npmRebuild=false",
+	"test": "vitest --run",
 		"test:watch": "vitest",
+		"test:cursor-native:win": "node scripts/test-windows-native-cursor.mjs",
+		"capture:openscreen-preview": "node scripts/capture-openscreen-preview.mjs",
 		"build-vite": "tsc && vite build",
 		"test:browser": "vitest --config vitest.browser.config.ts --run",
 		"test:browser:install": "playwright install --with-deps chromium-headless-shell",
diff --git a/scripts/capture-openscreen-preview.mjs b/scripts/capture-openscreen-preview.mjs
new file mode 100644
index 000000000..6c9b6ebf1
--- /dev/null
+++ b/scripts/capture-openscreen-preview.mjs
@@ -0,0 +1,262 @@
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { chromium, _electron as electron } from "@playwright/test";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ROOT = path.join(__dirname, "..");
+const MAIN_JS = path.join(ROOT, "dist-electron", "main.js");
+const TEST_VIDEO = path.join(ROOT, "tests", "fixtures", "sample.webm");
+const OUTPUT_DIR =
+	process.env.OPENSCREEN_PREVIEW_OUTPUT_DIR ??
+	path.join(os.tmpdir(), `openscreen-real-preview-${Date.now()}`);
+const FRAME_COUNT = Number(process.env.OPENSCREEN_PREVIEW_FRAME_COUNT ?? 90);
+const FPS = Number(process.env.OPENSCREEN_PREVIEW_FPS ?? 30);
+
+function findLatestCursorRecordingData() {
+	const explicit = process.env.CURSOR_RECORDING_DATA_PATH;
+	if (explicit) {
+		if (!fs.existsSync(explicit)) {
+			throw new Error(`CURSOR_RECORDING_DATA_PATH does not exist: ${explicit}`);
+		}
+		return explicit;
+	}
+
+	const tempDir = os.tmpdir();
+	const candidates = fs
+		.readdirSync(tempDir, { withFileTypes: true })
+		.filter((entry) => entry.isDirectory() && entry.name.startsWith("openscreen-cursor-native-"))
+		.map((entry) => path.join(tempDir, entry.name, "cursor-recording-data.json"))
+		.filter((candidate) => fs.existsSync(candidate))
+		.map((candidate) => ({ path: candidate, mtimeMs: fs.statSync(candidate).mtimeMs }))
+		.sort((a, b) => b.mtimeMs - a.mtimeMs);
+
+	if (!candidates[0]) {
+		throw new Error(
+			"No cursor-recording-data.json found. Run npm run test:cursor-native:win first.",
+		);
+	}
+
+	return candidates[0].path;
+}
+
+function findPlaywrightChromiumExecutable(defaultPath) {
+	if (fs.existsSync(defaultPath)) {
+		return defaultPath;
+	}
+
+	const baseDir = path.join(process.env.LOCALAPPDATA ?? "", "ms-playwright");
+	if (!baseDir || !fs.existsSync(baseDir)) {
+		return defaultPath;
+	}
+
+	const candidates = fs
+		.readdirSync(baseDir, { withFileTypes: true })
+		.filter((entry) => entry.isDirectory() && entry.name.startsWith("chromium-"))
+		.map((entry) => path.join(baseDir, entry.name, "chrome-win64", "chrome.exe"))
+		.filter((candidate) => fs.existsSync(candidate))
+		.sort()
+		.reverse();
+
+	return candidates[0] ?? defaultPath;
+}
+
+function ensureBuildExists() {
+	if (!fs.existsSync(MAIN_JS)) {
+		throw new Error(`Missing ${MAIN_JS}. Run npm run build-vite first.`);
+	}
+	if (!fs.existsSync(path.join(ROOT, "dist", "index.html"))) {
+		throw new Error(`Missing renderer build. Run npm run build-vite first.`);
+	}
+}
+
+function runNpmBuildViteIfRequested() {
+	if (process.env.OPENSCREEN_PREVIEW_SKIP_BUILD === "true") {
+		ensureBuildExists();
+		return Promise.resolve();
+	}
+
+	return new Promise((resolve, reject) => {
+		const child = spawn("cmd.exe", ["/d", "/s", "/c", "npm run build-vite"], {
+			cwd: ROOT,
+			stdio: "inherit",
+		});
+		child.once("error", reject);
+		child.once("exit", (code) => {
+			if (code === 0) resolve();
+			else reject(new Error(`npm run build-vite failed with code ${code}`));
+		});
+	});
+}
+
+async function encodeFramesToWebm(framePaths, outputPath) {
+	const frameData = framePaths.map((framePath) => ({
+		src: `data:image/png;base64,${fs.readFileSync(framePath).toString("base64")}`,
+	}));
+	const html = `<!doctype html>
+<html>
+<body>
+<canvas id="canvas" width="1280" height="800"></canvas>
+<script>
+const frames = ${JSON.stringify(frameData)};
+const fps = ${FPS};
+const canvas = document.getElementById("canvas");
+const ctx = canvas.getContext("2d");
+function load(src) {
+	return new Promise((resolve) => {
+		const img = new Image();
+		img.onload = () => resolve(img);
+		img.src = src;
+	});
+}
+window.__encode = async function() {
+	const images = [];
+	for (const frame of frames) images.push(await load(frame.src));
+	canvas.width = images[0].naturalWidth;
+	canvas.height = images[0].naturalHeight;
+	const stream = canvas.captureStream(fps);
+	const recorder = new MediaRecorder(stream, { mimeType: "video/webm;codecs=vp9" });
+	const chunks = [];
+	recorder.ondataavailable = (event) => {
+		if (event.data.size > 0) chunks.push(event.data);
+	};
+	const done = new Promise((resolve) => {
+		recorder.onstop = resolve;
+	});
+	recorder.start();
+	for (const image of images) {
+		ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+		await new Promise((resolve) => setTimeout(resolve, 1000 / fps));
+	}
+	recorder.stop();
+	await done;
+	const blob = new Blob(chunks, { type: "video/webm" });
+	const buffer = await blob.arrayBuffer();
+	const bytes = new Uint8Array(buffer);
+	let binary = "";
+	for (let index = 0; index < bytes.length; index += 0x8000) {
+		binary += String.fromCharCode(...bytes.subarray(index, index + 0x8000));
+	}
+	return btoa(binary);
+};
+</script>
+</body>
+</html>`;
+
+	const browser = await chromium.launch({
+		executablePath: findPlaywrightChromiumExecutable(chromium.executablePath()),
+		headless: true,
+	});
+	try {
+		const page = await browser.newPage();
+		await page.setContent(html);
+		const base64 = await page.evaluate(() => window.__encode());
+		fs.writeFileSync(outputPath, Buffer.from(base64, "base64"));
+	} finally {
+		await browser.close();
+	}
+}
+
+fs.mkdirSync(OUTPUT_DIR, { recursive: true });
+const cursorRecordingDataPath = findLatestCursorRecordingData();
+const fixtureVideoPath = path.join(OUTPUT_DIR, "openscreen-preview-fixture.webm");
+const outputVideoPath = path.join(OUTPUT_DIR, "openscreen-preview.webm");
+fs.copyFileSync(TEST_VIDEO, fixtureVideoPath);
+fs.copyFileSync(cursorRecordingDataPath, `${fixtureVideoPath}.cursor.json`);
+
+await runNpmBuildViteIfRequested();
+
+const app = await electron.launch({
+	args: [MAIN_JS, "--no-sandbox", "--enable-unsafe-swiftshader"],
+	env: {
+		...process.env,
+		HEADLESS: "false",
+	},
+});
+
+app.process().stdout?.on("data", (data) => process.stdout.write(`[electron] ${data}`));
+app.process().stderr?.on("data", (data) => process.stderr.write(`[electron] ${data}`));
+
+const framesDir = path.join(OUTPUT_DIR, "frames");
+fs.mkdirSync(framesDir, { recursive: true });
+
+try {
+	const hudWindow = await app.firstWindow({ timeout: 60_000 });
+	await hudWindow.waitForLoadState("domcontentloaded");
+	await hudWindow.evaluate(async () => {
+		for (let attempt = 0; attempt < 100; attempt += 1) {
+			try {
+				await window.electronAPI.getCurrentRecordingSession();
+				await window.electronAPI.getCurrentVideoPath();
+				return;
+			} catch {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			}
+		}
+		throw new Error("Timed out waiting for OpenScreen IPC handlers.");
+	});
+
+	try {
+		await hudWindow.evaluate(async (videoPath) => {
+			await window.electronAPI.setCurrentVideoPath(videoPath);
+			await window.electronAPI.switchToEditor();
+		}, fixtureVideoPath);
+	} catch {
+		// switchToEditor closes the HUD page before the evaluate promise can always resolve.
+	}
+
+	const editorWindow = await app.waitForEvent("window", {
+		predicate: (window) => window.url().includes("windowType=editor"),
+		timeout: 30_000,
+	});
+	await editorWindow.waitForLoadState("domcontentloaded");
+	await editorWindow.waitForSelector("video", { state: "attached", timeout: 30_000 });
+	await editorWindow.waitForSelector("canvas", { state: "attached", timeout: 30_000 });
+	await editorWindow.waitForSelector('img[aria-hidden="true"]', {
+		state: "attached",
+		timeout: 30_000,
+	});
+
+	await editorWindow.setViewportSize({ width: 1280, height: 800 });
+	await editorWindow.evaluate(async () => {
+		await document.fonts.ready;
+		for (const video of [...document.querySelectorAll("video")]) {
+			video.muted = true;
+			video.currentTime = 0;
+			video.dispatchEvent(new Event("timeupdate"));
+		}
+	});
+	await editorWindow.waitForTimeout(1000);
+
+	const framePaths = [];
+	for (let index = 0; index < FRAME_COUNT; index += 1) {
+		const timeSec = index / FPS;
+		await editorWindow.evaluate((time) => {
+			for (const video of [...document.querySelectorAll("video")]) {
+				video.currentTime = Math.min(time, Math.max(0, video.duration || time));
+				video.dispatchEvent(new Event("timeupdate"));
+			}
+		}, timeSec);
+		await editorWindow.waitForTimeout(40);
+		const framePath = path.join(framesDir, `frame-${String(index).padStart(4, "0")}.png`);
+		await editorWindow.screenshot({ path: framePath });
+		framePaths.push(framePath);
+	}
+
+	await encodeFramesToWebm(framePaths, outputVideoPath);
+
+	const report = {
+		outputDir: OUTPUT_DIR,
+		sourceCursorRecordingDataPath: cursorRecordingDataPath,
+		fixtureVideoPath,
+		outputVideoPath,
+		frameCount: framePaths.length,
+		fps: FPS,
+	};
+	fs.writeFileSync(path.join(OUTPUT_DIR, "report.json"), JSON.stringify(report, null, 2));
+	console.log(JSON.stringify(report, null, 2));
+} finally {
+	await app.close();
+}
diff --git a/scripts/test-windows-native-cursor.mjs b/scripts/test-windows-native-cursor.mjs
new file mode 100644
index 000000000..2a8b34c7f
--- /dev/null
+++ b/scripts/test-windows-native-cursor.mjs
@@ -0,0 +1,1113 @@
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+const SAMPLE_INTERVAL_MS = Number(process.env.CURSOR_TEST_SAMPLE_INTERVAL_MS ?? 25);
+const DURATION_MS = Number(process.env.CURSOR_TEST_DURATION_MS ?? 1800);
+const SCREEN_FRAME_INTERVAL_MS = Number(process.env.CURSOR_TEST_SCREEN_FRAME_INTERVAL_MS ?? 100);
+const READY_TIMEOUT_MS = 5000;
+const OUTPUT_DIR =
+	process.env.CURSOR_TEST_OUTPUT_DIR ??
+	path.join(os.tmpdir(), `openscreen-cursor-native-${Date.now()}`);
+
+if (process.platform !== "win32") {
+	console.error("This diagnostic is Windows-only.");
+	process.exit(1);
+}
+
+function encodePowerShell(script) {
+	return Buffer.from(script, "utf16le").toString("base64");
+}
+
+function quotePowerShellString(value) {
+	return `'${String(value).replaceAll("'", "''")}'`;
+}
+
+function runPowerShell(script) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(
+			"powershell.exe",
+			[
+				"-NoLogo",
+				"-NoProfile",
+				"-NonInteractive",
+				"-ExecutionPolicy",
+				"Bypass",
+				"-EncodedCommand",
+				encodePowerShell(script),
+			],
+			{ stdio: ["ignore", "pipe", "pipe"], windowsHide: true },
+		);
+
+		let stdout = "";
+		let stderr = "";
+		child.stdout.setEncoding("utf8");
+		child.stderr.setEncoding("utf8");
+		child.stdout.on("data", (chunk) => {
+			stdout += chunk;
+		});
+		child.stderr.on("data", (chunk) => {
+			stderr += chunk;
+		});
+		child.once("error", reject);
+		child.once("exit", (code, signal) => {
+			if (code === 0) {
+				resolve(stdout);
+				return;
+			}
+
+			reject(
+				new Error(`PowerShell command failed (code=${code}, signal=${signal}): ${stderr.trim()}`),
+			);
+		});
+	});
+}
+
+function spawnPowerShell(script, { onStdout, onStderr } = {}) {
+	const child = spawn(
+		"powershell.exe",
+		[
+			"-NoLogo",
+			"-NoProfile",
+			"-NonInteractive",
+			"-ExecutionPolicy",
+			"Bypass",
+			"-EncodedCommand",
+			encodePowerShell(script),
+		],
+		{ stdio: ["ignore", "pipe", "pipe"], windowsHide: true },
+	);
+
+	child.stdout.setEncoding("utf8");
+	child.stderr.setEncoding("utf8");
+	child.stdout.on("data", (chunk) => onStdout?.(chunk));
+	child.stderr.on("data", (chunk) => onStderr?.(chunk));
+
+	const done = new Promise((resolve, reject) => {
+		child.once("error", reject);
+		child.once("exit", (code, signal) => {
+			if (code === 0 || child.killed) {
+				resolve({ code, signal });
+				return;
+			}
+
+			reject(new Error(`PowerShell process failed (code=${code}, signal=${signal})`));
+		});
+	});
+
+	return { child, done };
+}
+
+function buildSamplerScript() {
+	return String.raw`
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Drawing
+Add-Type -AssemblyName System.Windows.Forms
+
+$source = @"
+using System;
+using System.Runtime.InteropServices;
+
+public static class OpenScreenCursorDiagnosticInterop {
+    [StructLayout(LayoutKind.Sequential)]
+    public struct POINT {
+        public int X;
+        public int Y;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct CURSORINFO {
+        public int cbSize;
+        public int flags;
+        public IntPtr hCursor;
+        public POINT ptScreenPos;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ICONINFO {
+        [MarshalAs(UnmanagedType.Bool)]
+        public bool fIcon;
+        public int xHotspot;
+        public int yHotspot;
+        public IntPtr hbmMask;
+        public IntPtr hbmColor;
+    }
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool GetCursorInfo(ref CURSORINFO pci);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr CopyIcon(IntPtr hIcon);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DestroyIcon(IntPtr hIcon);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool GetIconInfo(IntPtr hIcon, out ICONINFO piconinfo);
+
+    [DllImport("gdi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DeleteObject(IntPtr hObject);
+}
+"@
+
+Add-Type -TypeDefinition $source
+
+$standardCursors = @{
+    arrow = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32512))
+    text = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32513))
+    wait = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32514))
+    crosshair = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32515))
+    'up-arrow' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32516))
+    'resize-nwse' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32642))
+    'resize-nesw' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32643))
+    'resize-ew' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32644))
+    'resize-ns' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32645))
+    move = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32646))
+    'not-allowed' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32648))
+    pointer = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32649))
+    'app-starting' = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32650))
+    help = [OpenScreenCursorDiagnosticInterop]::LoadCursor([IntPtr]::Zero, [IntPtr]::new(32651))
+}
+
+function Get-StandardCursorType($cursorHandle) {
+    if ($cursorHandle -eq [IntPtr]::Zero) {
+        return $null
+    }
+
+    foreach ($entry in $standardCursors.GetEnumerator()) {
+        if ($entry.Value -eq $cursorHandle) {
+            return $entry.Key
+        }
+    }
+
+    return $null
+}
+
+function Write-JsonLine($payload) {
+    [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
+}
+
+function Get-CursorAsset($cursorHandle, $cursorId) {
+    $copiedHandle = [OpenScreenCursorDiagnosticInterop]::CopyIcon($cursorHandle)
+    if ($copiedHandle -eq [IntPtr]::Zero) {
+        return $null
+    }
+
+    $iconInfo = New-Object OpenScreenCursorDiagnosticInterop+ICONINFO
+    $hasIconInfo = [OpenScreenCursorDiagnosticInterop]::GetIconInfo($copiedHandle, [ref]$iconInfo)
+
+    try {
+        $icon = [System.Drawing.Icon]::FromHandle($copiedHandle)
+        $bitmap = New-Object System.Drawing.Bitmap $icon.Width, $icon.Height, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
+        $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+        $memoryStream = New-Object System.IO.MemoryStream
+
+        try {
+            $graphics.Clear([System.Drawing.Color]::Transparent)
+            $graphics.DrawIcon($icon, 0, 0)
+            $bitmap.Save($memoryStream, [System.Drawing.Imaging.ImageFormat]::Png)
+            $base64 = [System.Convert]::ToBase64String($memoryStream.ToArray())
+
+            return @{
+                id = $cursorId
+                imageDataUrl = "data:image/png;base64,$base64"
+                width = $bitmap.Width
+                height = $bitmap.Height
+                hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
+                hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+            }
+        }
+        finally {
+            $memoryStream.Dispose()
+            $graphics.Dispose()
+            $bitmap.Dispose()
+            $icon.Dispose()
+        }
+    }
+    finally {
+        if ($hasIconInfo) {
+            if ($iconInfo.hbmMask -ne [IntPtr]::Zero) {
+                [OpenScreenCursorDiagnosticInterop]::DeleteObject($iconInfo.hbmMask) | Out-Null
+            }
+            if ($iconInfo.hbmColor -ne [IntPtr]::Zero) {
+                [OpenScreenCursorDiagnosticInterop]::DeleteObject($iconInfo.hbmColor) | Out-Null
+            }
+        }
+        [OpenScreenCursorDiagnosticInterop]::DestroyIcon($copiedHandle) | Out-Null
+    }
+}
+
+Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
+
+$lastCursorId = $null
+$screenBounds = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds
+while ($true) {
+    $cursorInfo = New-Object OpenScreenCursorDiagnosticInterop+CURSORINFO
+    $cursorInfo.cbSize = [Runtime.InteropServices.Marshal]::SizeOf([type][OpenScreenCursorDiagnosticInterop+CURSORINFO])
+
+    if (-not [OpenScreenCursorDiagnosticInterop]::GetCursorInfo([ref]$cursorInfo)) {
+        Write-JsonLine @{ type = 'error'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds(); message = 'GetCursorInfo failed' }
+        Start-Sleep -Milliseconds ${SAMPLE_INTERVAL_MS}
+        continue
+    }
+
+    $visible = ($cursorInfo.flags -band 1) -ne 0
+    $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
+    $cursorType = Get-StandardCursorType $cursorInfo.hCursor
+    $asset = $null
+
+    if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
+        $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
+        if ($asset -and $cursorType) {
+            $asset.cursorType = $cursorType
+        }
+        $lastCursorId = $cursorId
+    }
+
+    Write-JsonLine @{
+        type = 'sample'
+        timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()
+        x = $cursorInfo.ptScreenPos.X
+        y = $cursorInfo.ptScreenPos.Y
+        visible = $visible
+        handle = $cursorId
+        cursorType = $cursorType
+        bounds = @{
+            x = $screenBounds.Left
+            y = $screenBounds.Top
+            width = $screenBounds.Width
+            height = $screenBounds.Height
+        }
+        asset = $asset
+    }
+
+    Start-Sleep -Milliseconds ${SAMPLE_INTERVAL_MS}
+}
+`;
+}
+
+function buildMousePathScript(durationMs) {
+	const stepMs = 120;
+	const steps = Math.max(8, Math.floor(durationMs / stepMs));
+
+	return String.raw`
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Windows.Forms
+
+$source = @"
+using System.Runtime.InteropServices;
+
+public static class OpenScreenMouseDiagnosticInterop {
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool SetCursorPos(int X, int Y);
+}
+"@
+
+Add-Type -TypeDefinition $source
+
+$bounds = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds
+$points = @()
+for ($i = 0; $i -lt ${steps}; $i++) {
+    $t = if (${steps} -le 1) { 0 } else { $i / (${steps} - 1) }
+    $x = [int]($bounds.Left + 80 + (($bounds.Width - 160) * $t))
+    $wave = [Math]::Sin($t * [Math]::PI * 2)
+    $y = [int]($bounds.Top + ($bounds.Height / 2) + ($wave * [Math]::Min(180, $bounds.Height / 4)))
+    $points += @{ x = $x; y = $y }
+}
+
+foreach ($point in $points) {
+    [OpenScreenMouseDiagnosticInterop]::SetCursorPos($point.x, $point.y) | Out-Null
+    Start-Sleep -Milliseconds ${stepMs}
+}
+`;
+}
+
+function buildScreenRecorderScript(outputDir, durationMs) {
+	const framesDir = path.join(outputDir, "screen-frames");
+
+	return String.raw`
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Drawing
+Add-Type -AssemblyName System.Windows.Forms
+
+$framesDir = ${quotePowerShellString(framesDir)}
+New-Item -ItemType Directory -Force -Path $framesDir | Out-Null
+
+$bounds = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds
+$targetWidth = 960
+$targetHeight = [int]([Math]::Round($targetWidth * ($bounds.Height / $bounds.Width)))
+$frames = New-Object System.Collections.Generic.List[object]
+$stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+$index = 0
+
+while ($stopwatch.ElapsedMilliseconds -le ${durationMs + 700}) {
+    $sourceBitmap = New-Object System.Drawing.Bitmap $bounds.Width, $bounds.Height, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
+    $graphics = [System.Drawing.Graphics]::FromImage($sourceBitmap)
+    $scaledBitmap = New-Object System.Drawing.Bitmap $targetWidth, $targetHeight, ([System.Drawing.Imaging.PixelFormat]::Format32bppArgb)
+    $scaledGraphics = [System.Drawing.Graphics]::FromImage($scaledBitmap)
+    $timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()
+    $fileName = ('frame_{0:D4}.png' -f $index)
+    $path = Join-Path $framesDir $fileName
+
+    try {
+        $graphics.CopyFromScreen($bounds.Left, $bounds.Top, 0, 0, $bounds.Size)
+        $scaledGraphics.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
+        $scaledGraphics.DrawImage($sourceBitmap, 0, 0, $targetWidth, $targetHeight)
+        $scaledBitmap.Save($path, [System.Drawing.Imaging.ImageFormat]::Png)
+        $frames.Add(@{
+            index = $index
+            timestampMs = $timestampMs
+            path = $path
+            width = $targetWidth
+            height = $targetHeight
+            bounds = @{
+                x = $bounds.Left
+                y = $bounds.Top
+                width = $bounds.Width
+                height = $bounds.Height
+            }
+        }) | Out-Null
+    }
+    finally {
+        $scaledGraphics.Dispose()
+        $scaledBitmap.Dispose()
+        $graphics.Dispose()
+        $sourceBitmap.Dispose()
+    }
+
+    $index += 1
+    Start-Sleep -Milliseconds ${SCREEN_FRAME_INTERVAL_MS}
+}
+
+($frames | ConvertTo-Json -Depth 6) | Set-Content -Path (Join-Path $framesDir 'frames.json') -Encoding UTF8
+`;
+}
+
+function waitForReady(events) {
+	return new Promise((resolve, reject) => {
+		const startedAt = Date.now();
+		const timer = setInterval(() => {
+			if (events.some((event) => event.type === "ready")) {
+				clearInterval(timer);
+				resolve();
+				return;
+			}
+
+			if (Date.now() - startedAt > READY_TIMEOUT_MS) {
+				clearInterval(timer);
+				reject(new Error("Timed out waiting for cursor sampler readiness."));
+			}
+		}, 25);
+	});
+}
+
+function writeAssets(assets, outputDir) {
+	const assetDir = path.join(outputDir, "assets");
+	fs.mkdirSync(assetDir, { recursive: true });
+
+	for (const asset of assets.values()) {
+		const base64 = asset.imageDataUrl?.replace(/^data:image\/png;base64,/, "");
+		if (!base64) {
+			continue;
+		}
+
+		const safeId = String(asset.id).replace(/[^a-zA-Z0-9_-]/g, "_");
+		fs.writeFileSync(path.join(assetDir, `${safeId}.png`), Buffer.from(base64, "base64"));
+	}
+}
+
+function toRecordingData(samples, assets) {
+	const firstTimestampMs = samples[0]?.timestampMs ?? Date.now();
+	const normalizedSamples = samples.flatMap((sample) => {
+		const bounds = sample.bounds;
+		if (!bounds || bounds.width <= 0 || bounds.height <= 0) {
+			return [];
+		}
+
+		return [
+			{
+				timeMs: Math.max(0, sample.timestampMs - firstTimestampMs),
+				cx: (sample.x - bounds.x) / bounds.width,
+				cy: (sample.y - bounds.y) / bounds.height,
+				assetId: sample.handle,
+				visible: Boolean(sample.visible),
+				cursorType: sample.cursorType ?? null,
+			},
+		];
+	});
+
+	return {
+		version: 2,
+		provider: assets.size > 0 ? "native" : "none",
+		samples: normalizedSamples,
+		assets: [...assets.values()].map((asset) => ({
+			id: asset.id,
+			platform: "win32",
+			imageDataUrl: asset.imageDataUrl,
+			width: asset.width,
+			height: asset.height,
+			hotspotX: asset.hotspotX,
+			hotspotY: asset.hotspotY,
+			scaleFactor: 1,
+			cursorType: asset.cursorType ?? null,
+		})),
+	};
+}
+
+function escapeScriptJson(value) {
+	return JSON.stringify(value).replace(/</g, "\\u003c");
+}
+
+function buildVisualReportHtml(report, recordingData) {
+	return `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>OpenScreen native cursor diagnostic</title>
+<style>
+body { margin: 0; background: #111; color: #eee; font-family: Arial, sans-serif; }
+main { max-width: 1180px; margin: 0 auto; padding: 24px; }
+h1 { font-size: 22px; margin: 0 0 16px; }
+.metrics { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 8px; margin-bottom: 16px; }
+.metric { background: #1d1d1d; border: 1px solid #333; padding: 10px; border-radius: 6px; }
+.metric b { display: block; color: #9bd; font-size: 20px; }
+canvas { width: 100%; height: auto; background: #181818; border: 1px solid #333; border-radius: 6px; }
+.assets { display: flex; flex-wrap: wrap; gap: 12px; margin-top: 18px; }
+.asset { background: #1d1d1d; border: 1px solid #333; border-radius: 6px; padding: 10px; min-width: 130px; }
+.asset img { image-rendering: auto; width: 64px; height: 64px; object-fit: contain; background: repeating-conic-gradient(#444 0 25%, #333 0 50%) 50% / 16px 16px; }
+.hint { color: #aaa; font-size: 13px; margin: 10px 0 18px; }
+</style>
+</head>
+<body>
+<main>
+<h1>OpenScreen native cursor diagnostic</h1>
+<div class="metrics">
+<div class="metric"><b>${report.sampleCount}</b>samples</div>
+<div class="metric"><b>${report.assetCount}</b>assets</div>
+<div class="metric"><b>${report.uniquePositionCount}</b>positions</div>
+<div class="metric"><b>${report.errorCount}</b>errors</div>
+</div>
+<p class="hint">The red cross is the captured native hotspot. Native bitmaps are drawn at 1x, 2x, and 3x. The last cursor is a crisp vector 3x replacement anchored on the same hotspot.</p>
+<canvas id="preview" width="960" height="540"></canvas>
+<section class="assets" id="assets"></section>
+</main>
+<script id="recording-data" type="application/json">${escapeScriptJson(recordingData)}</script>
+<script>
+const recording = JSON.parse(document.getElementById("recording-data").textContent);
+const canvas = document.getElementById("preview");
+const ctx = canvas.getContext("2d");
+const durationMs = Math.max(1000, recording.samples.at(-1)?.timeMs ?? 1000);
+const images = new Map();
+
+function clamp(value, min, max) {
+	return Math.min(max, Math.max(min, value));
+}
+
+function loadImages() {
+	return Promise.all(recording.assets.map((asset) => new Promise((resolve) => {
+		const image = new Image();
+		image.onload = () => {
+			images.set(asset.id, image);
+			resolve();
+		};
+		image.src = asset.imageDataUrl;
+	})));
+}
+
+function frameAt(timeMs) {
+	let active = null;
+	let next = null;
+	for (let i = 0; i < recording.samples.length; i += 1) {
+		const sample = recording.samples[i];
+		if (sample.timeMs <= timeMs) {
+			active = sample;
+			next = recording.samples[i + 1] ?? null;
+		} else {
+			break;
+		}
+	}
+	if (!active || active.visible === false || !active.assetId) return null;
+	const asset = recording.assets.find((candidate) => candidate.id === active.assetId);
+	if (!asset) return null;
+	if (!next || next.visible === false || next.assetId !== active.assetId || next.timeMs <= active.timeMs) {
+		return { sample: active, asset };
+	}
+	const t = clamp((timeMs - active.timeMs) / (next.timeMs - active.timeMs), 0, 1);
+	return {
+		asset,
+		sample: {
+			...active,
+			cx: active.cx + (next.cx - active.cx) * t,
+			cy: active.cy + (next.cy - active.cy) * t,
+		},
+	};
+}
+
+function drawFrame(timeMs) {
+	ctx.clearRect(0, 0, canvas.width, canvas.height);
+	ctx.fillStyle = "#181818";
+	ctx.fillRect(0, 0, canvas.width, canvas.height);
+	ctx.strokeStyle = "#2a2a2a";
+	ctx.lineWidth = 1;
+	for (let x = 0; x <= canvas.width; x += 80) {
+		ctx.beginPath();
+		ctx.moveTo(x, 0);
+		ctx.lineTo(x, canvas.height);
+		ctx.stroke();
+	}
+	for (let y = 0; y <= canvas.height; y += 60) {
+		ctx.beginPath();
+		ctx.moveTo(0, y);
+		ctx.lineTo(canvas.width, y);
+		ctx.stroke();
+	}
+
+	ctx.strokeStyle = "#5dd";
+	ctx.lineWidth = 2;
+	ctx.beginPath();
+	for (const [index, sample] of recording.samples.entries()) {
+		const x = sample.cx * canvas.width;
+		const y = sample.cy * canvas.height;
+		if (index === 0) ctx.moveTo(x, y);
+		else ctx.lineTo(x, y);
+	}
+	ctx.stroke();
+
+	const frame = frameAt(timeMs);
+	if (!frame) return;
+	const x = frame.sample.cx * canvas.width;
+	const y = frame.sample.cy * canvas.height;
+	const image = images.get(frame.asset.id);
+
+	for (const scale of [1, 2, 3]) {
+		const offsetX = (scale - 2) * 100 - 50;
+		const drawWidth = frame.asset.width * scale;
+		const drawHeight = frame.asset.height * scale;
+		const hotspotX = frame.asset.hotspotX * scale;
+		const hotspotY = frame.asset.hotspotY * scale;
+		if (image) {
+			ctx.drawImage(image, x + offsetX - hotspotX, y - hotspotY, drawWidth, drawHeight);
+		}
+		ctx.strokeStyle = "#f44";
+		ctx.lineWidth = 2;
+		ctx.beginPath();
+		ctx.moveTo(x + offsetX - 8, y);
+		ctx.lineTo(x + offsetX + 8, y);
+		ctx.moveTo(x + offsetX, y - 8);
+		ctx.lineTo(x + offsetX, y + 8);
+		ctx.stroke();
+		ctx.fillStyle = "#fff";
+		ctx.fillText(scale + "x", x + offsetX + 12, y - 12);
+	}
+	drawPrettyArrow(ctx, x + 210, y, 3);
+	ctx.strokeStyle = "#f44";
+	ctx.lineWidth = 2;
+	ctx.beginPath();
+	ctx.moveTo(x + 210 - 8, y);
+	ctx.lineTo(x + 210 + 8, y);
+	ctx.moveTo(x + 210, y - 8);
+	ctx.lineTo(x + 210, y + 8);
+	ctx.stroke();
+	ctx.fillStyle = "#fff";
+	ctx.fillText("pretty 3x", x + 222, y - 12);
+}
+
+function drawPrettyArrow(context, x, y, scale) {
+	context.save();
+	context.translate(x, y);
+	context.scale(scale, scale);
+	context.shadowColor = "rgba(0, 0, 0, 0.35)";
+	context.shadowBlur = 2;
+	context.shadowOffsetY = 1;
+	const path = new Path2D("M0 0 L0 23 L6.2 17 L10.5 29.5 L16.5 27.4 L12.2 15.2 L21.2 15.2 Z");
+	context.fillStyle = "#ffffff";
+	context.strokeStyle = "#111111";
+	context.lineWidth = 1.35;
+	context.lineJoin = "round";
+	context.fill(path);
+	context.stroke(path);
+	context.restore();
+}
+
+function renderAssets() {
+	const root = document.getElementById("assets");
+	for (const asset of recording.assets) {
+		const item = document.createElement("div");
+		item.className = "asset";
+		item.innerHTML = '<img src="' + asset.imageDataUrl + '" alt=""><div>' + asset.id + '</div><div>' + asset.width + 'x' + asset.height + ', hotspot ' + asset.hotspotX + ',' + asset.hotspotY + '</div>';
+		root.appendChild(item);
+	}
+}
+
+window.__exportWebm = async function() {
+	await loadImages();
+	const stream = canvas.captureStream(30);
+	const recorder = new MediaRecorder(stream, { mimeType: "video/webm;codecs=vp9" });
+	const chunks = [];
+	recorder.ondataavailable = (event) => {
+		if (event.data.size > 0) chunks.push(event.data);
+	};
+	const done = new Promise((resolve) => {
+		recorder.onstop = resolve;
+	});
+	recorder.start();
+	const startedAt = performance.now();
+	await new Promise((resolve) => {
+		function tick(now) {
+			const elapsed = now - startedAt;
+			drawFrame((elapsed / 3200) * durationMs);
+			if (elapsed < 3200) requestAnimationFrame(tick);
+			else resolve();
+		}
+		requestAnimationFrame(tick);
+	});
+	recorder.stop();
+	await done;
+	const blob = new Blob(chunks, { type: "video/webm" });
+	const buffer = await blob.arrayBuffer();
+	const bytes = new Uint8Array(buffer);
+	let binary = "";
+	for (let index = 0; index < bytes.length; index += 0x8000) {
+		binary += String.fromCharCode(...bytes.subarray(index, index + 0x8000));
+	}
+	return btoa(binary);
+};
+
+loadImages().then(() => {
+	renderAssets();
+	let startedAt = performance.now();
+	function animate(now) {
+		const elapsed = (now - startedAt) % 3200;
+		drawFrame((elapsed / 3200) * durationMs);
+		requestAnimationFrame(animate);
+	}
+	requestAnimationFrame(animate);
+});
+</script>
+</body>
+</html>`;
+}
+
+function readScreenFrames(outputDir, recordingStartTimestampMs) {
+	const framesJsonPath = path.join(outputDir, "screen-frames", "frames.json");
+	if (!fs.existsSync(framesJsonPath)) {
+		return [];
+	}
+
+	const rawFrames = JSON.parse(fs.readFileSync(framesJsonPath, "utf8").replace(/^\uFEFF/, ""));
+	const frames = Array.isArray(rawFrames) ? rawFrames : [rawFrames];
+
+	return frames
+		.filter((frame) => frame?.path && fs.existsSync(frame.path))
+		.map((frame) => ({
+			...frame,
+			timeMs: Math.max(0, frame.timestampMs - recordingStartTimestampMs),
+			imageDataUrl: `data:image/png;base64,${fs.readFileSync(frame.path).toString("base64")}`,
+		}));
+}
+
+function buildRealCaptureHtml(report, recordingData, screenFrames) {
+	return `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>OpenScreen native cursor real capture diagnostic</title>
+<style>
+body { margin: 0; background: #080808; color: #eee; font-family: Arial, sans-serif; }
+main { max-width: 1180px; margin: 0 auto; padding: 20px; }
+h1 { font-size: 20px; margin: 0 0 12px; }
+canvas { width: 100%; height: auto; background: #111; border: 1px solid #333; border-radius: 6px; }
+.hint { color: #aaa; font-size: 13px; margin: 8px 0 14px; }
+</style>
+</head>
+<body>
+<main>
+<h1>Real screen capture + reconstructed native cursor</h1>
+<p class="hint">Background frames are real Windows screenshots. Native bitmaps are reconstructed at 1x, 2x, and 3x; the last cursor is a crisp vector 3x replacement. The red cross marks the recorded hotspot.</p>
+<canvas id="preview" width="${screenFrames[0]?.width ?? 960}" height="${screenFrames[0]?.height ?? 540}"></canvas>
+</main>
+<script id="recording-data" type="application/json">${escapeScriptJson(recordingData)}</script>
+<script id="screen-frames" type="application/json">${escapeScriptJson(screenFrames)}</script>
+<script>
+const recording = JSON.parse(document.getElementById("recording-data").textContent);
+const frames = JSON.parse(document.getElementById("screen-frames").textContent);
+const canvas = document.getElementById("preview");
+const ctx = canvas.getContext("2d");
+const durationMs = Math.max(1000, recording.samples.at(-1)?.timeMs ?? 1000);
+const cursorImages = new Map();
+const frameImages = [];
+
+function clamp(value, min, max) {
+	return Math.min(max, Math.max(min, value));
+}
+
+function loadImage(src) {
+	return new Promise((resolve) => {
+		const image = new Image();
+		image.onload = () => resolve(image);
+		image.src = src;
+	});
+}
+
+async function loadImages() {
+	await Promise.all(recording.assets.map(async (asset) => {
+		cursorImages.set(asset.id, await loadImage(asset.imageDataUrl));
+	}));
+	for (const frame of frames) {
+		frameImages.push({ ...frame, image: await loadImage(frame.imageDataUrl) });
+	}
+}
+
+function closestFrame(timeMs) {
+	let best = frameImages[0] ?? null;
+	for (const frame of frameImages) {
+		if (Math.abs(frame.timeMs - timeMs) < Math.abs((best?.timeMs ?? 0) - timeMs)) {
+			best = frame;
+		}
+	}
+	return best;
+}
+
+function frameAt(timeMs) {
+	let active = null;
+	let next = null;
+	for (let i = 0; i < recording.samples.length; i += 1) {
+		const sample = recording.samples[i];
+		if (sample.timeMs <= timeMs) {
+			active = sample;
+			next = recording.samples[i + 1] ?? null;
+		} else {
+			break;
+		}
+	}
+	if (!active || active.visible === false || !active.assetId) return null;
+	const asset = recording.assets.find((candidate) => candidate.id === active.assetId);
+	if (!asset) return null;
+	if (!next || next.visible === false || next.assetId !== active.assetId || next.timeMs <= active.timeMs) {
+		return { sample: active, asset };
+	}
+	const t = clamp((timeMs - active.timeMs) / (next.timeMs - active.timeMs), 0, 1);
+	return {
+		asset,
+		sample: {
+			...active,
+			cx: active.cx + (next.cx - active.cx) * t,
+			cy: active.cy + (next.cy - active.cy) * t,
+		},
+	};
+}
+
+function drawCursorVariant(frame, scale, offsetX) {
+	const image = cursorImages.get(frame.asset.id);
+	const x = frame.sample.cx * canvas.width + offsetX;
+	const y = frame.sample.cy * canvas.height;
+	const drawWidth = frame.asset.width * scale;
+	const drawHeight = frame.asset.height * scale;
+	const hotspotX = frame.asset.hotspotX * scale;
+	const hotspotY = frame.asset.hotspotY * scale;
+	if (image) {
+		ctx.drawImage(image, x - hotspotX, y - hotspotY, drawWidth, drawHeight);
+	}
+	ctx.strokeStyle = "#ff3333";
+	ctx.lineWidth = 2;
+	ctx.beginPath();
+	ctx.moveTo(x - 9, y);
+	ctx.lineTo(x + 9, y);
+	ctx.moveTo(x, y - 9);
+	ctx.lineTo(x, y + 9);
+	ctx.stroke();
+	ctx.fillStyle = "#ffffff";
+	ctx.fillText(scale + "x", x + 12, y - 12);
+}
+
+function drawPrettyArrow(x, y, scale) {
+	ctx.save();
+	ctx.translate(x, y);
+	ctx.scale(scale, scale);
+	ctx.shadowColor = "rgba(0, 0, 0, 0.35)";
+	ctx.shadowBlur = 2;
+	ctx.shadowOffsetY = 1;
+	const path = new Path2D("M0 0 L0 23 L6.2 17 L10.5 29.5 L16.5 27.4 L12.2 15.2 L21.2 15.2 Z");
+	ctx.fillStyle = "#ffffff";
+	ctx.strokeStyle = "#111111";
+	ctx.lineWidth = 1.35;
+	ctx.lineJoin = "round";
+	ctx.fill(path);
+	ctx.stroke(path);
+	ctx.restore();
+}
+
+function drawPrettyCursorVariant(frame, scale, offsetX) {
+	const x = frame.sample.cx * canvas.width + offsetX;
+	const y = frame.sample.cy * canvas.height;
+	drawPrettyArrow(x, y, scale);
+	ctx.strokeStyle = "#ff3333";
+	ctx.lineWidth = 2;
+	ctx.beginPath();
+	ctx.moveTo(x - 9, y);
+	ctx.lineTo(x + 9, y);
+	ctx.moveTo(x, y - 9);
+	ctx.lineTo(x, y + 9);
+	ctx.stroke();
+	ctx.fillStyle = "#ffffff";
+	ctx.fillText("pretty " + scale + "x", x + 12, y - 12);
+}
+
+function drawFrame(timeMs) {
+	const background = closestFrame(timeMs);
+	ctx.clearRect(0, 0, canvas.width, canvas.height);
+	if (background) {
+		ctx.drawImage(background.image, 0, 0, canvas.width, canvas.height);
+	} else {
+		ctx.fillStyle = "#111";
+		ctx.fillRect(0, 0, canvas.width, canvas.height);
+	}
+	const frame = frameAt(timeMs);
+	if (!frame) return;
+	drawCursorVariant(frame, 1, -150);
+	drawCursorVariant(frame, 2, -40);
+	drawCursorVariant(frame, 3, 90);
+	drawPrettyCursorVariant(frame, 3, 245);
+}
+
+window.__exportWebm = async function() {
+	await loadImages();
+	const stream = canvas.captureStream(30);
+	const recorder = new MediaRecorder(stream, { mimeType: "video/webm;codecs=vp9" });
+	const chunks = [];
+	recorder.ondataavailable = (event) => {
+		if (event.data.size > 0) chunks.push(event.data);
+	};
+	const done = new Promise((resolve) => {
+		recorder.onstop = resolve;
+	});
+	recorder.start();
+	const startedAt = performance.now();
+	await new Promise((resolve) => {
+		function tick(now) {
+			const elapsed = now - startedAt;
+			drawFrame((elapsed / 3600) * durationMs);
+			if (elapsed < 3600) requestAnimationFrame(tick);
+			else resolve();
+		}
+		requestAnimationFrame(tick);
+	});
+	recorder.stop();
+	await done;
+	const blob = new Blob(chunks, { type: "video/webm" });
+	const buffer = await blob.arrayBuffer();
+	const bytes = new Uint8Array(buffer);
+	let binary = "";
+	for (let index = 0; index < bytes.length; index += 0x8000) {
+		binary += String.fromCharCode(...bytes.subarray(index, index + 0x8000));
+	}
+	return btoa(binary);
+};
+
+loadImages().then(() => {
+	let startedAt = performance.now();
+	function animate(now) {
+		const elapsed = (now - startedAt) % 3600;
+		drawFrame((elapsed / 3600) * durationMs);
+		requestAnimationFrame(animate);
+	}
+	requestAnimationFrame(animate);
+});
+</script>
+</body>
+</html>`;
+}
+
+function findPlaywrightChromiumExecutable(defaultPath) {
+	if (fs.existsSync(defaultPath)) {
+		return defaultPath;
+	}
+
+	const baseDir = path.join(process.env.LOCALAPPDATA ?? "", "ms-playwright");
+	if (!baseDir || !fs.existsSync(baseDir)) {
+		return defaultPath;
+	}
+
+	const candidates = fs
+		.readdirSync(baseDir, { withFileTypes: true })
+		.filter((entry) => entry.isDirectory() && entry.name.startsWith("chromium-"))
+		.map((entry) => path.join(baseDir, entry.name, "chrome-win64", "chrome.exe"))
+		.filter((candidate) => fs.existsSync(candidate))
+		.sort()
+		.reverse();
+
+	return candidates[0] ?? defaultPath;
+}
+
+async function writePreviewVideo(reportPath, outputPath) {
+	const { chromium } = await import("playwright");
+	const browser = await chromium.launch({
+		executablePath: findPlaywrightChromiumExecutable(chromium.executablePath()),
+		headless: true,
+	});
+	try {
+		const page = await browser.newPage({ viewport: { width: 1180, height: 760 } });
+		await page.goto(`file:///${reportPath.replaceAll("\\", "/")}`);
+		const base64 = await page.evaluate(() => window.__exportWebm());
+		fs.writeFileSync(outputPath, Buffer.from(base64, "base64"));
+	} finally {
+		await browser.close();
+	}
+}
+
+function assertReport(report) {
+	const failures = [];
+	if (report.sampleCount < Math.floor(DURATION_MS / SAMPLE_INTERVAL_MS / 3)) {
+		failures.push(`Too few samples: ${report.sampleCount}.`);
+	}
+	if (report.visibleSampleCount === 0) {
+		failures.push("No visible cursor samples were captured.");
+	}
+	if (report.assetCount === 0) {
+		failures.push("No cursor asset PNG was captured.");
+	}
+	if (report.uniquePositionCount < 4) {
+		failures.push(`Cursor movement was not observed enough times: ${report.uniquePositionCount}.`);
+	}
+	if (report.errorCount > 0) {
+		failures.push(`Sampler reported ${report.errorCount} error event(s).`);
+	}
+
+	if (failures.length > 0) {
+		throw new Error(failures.join(" "));
+	}
+}
+
+fs.mkdirSync(OUTPUT_DIR, { recursive: true });
+
+const events = [];
+const assets = new Map();
+let lineBuffer = "";
+let stoppingSampler = false;
+const sampler = spawnPowerShell(buildSamplerScript(), {
+	onStdout: (chunk) => {
+		lineBuffer += chunk;
+		const lines = lineBuffer.split(/\r?\n/);
+		lineBuffer = lines.pop() ?? "";
+
+		for (const line of lines) {
+			const trimmed = line.trim();
+			if (!trimmed) {
+				continue;
+			}
+
+			const event = JSON.parse(trimmed);
+			events.push(event);
+			if (event.asset?.id && !assets.has(event.asset.id)) {
+				assets.set(event.asset.id, event.asset);
+			}
+		}
+	},
+	onStderr: (chunk) => {
+		if (!stoppingSampler && !chunk.startsWith("#< CLIXML")) {
+			process.stderr.write(`[cursor-native-test] ${chunk}`);
+		}
+	},
+});
+let screenRecorder = null;
+
+try {
+	await waitForReady(events);
+	screenRecorder = spawnPowerShell(buildScreenRecorderScript(OUTPUT_DIR, DURATION_MS), {
+		onStderr: (chunk) => {
+			if (!chunk.startsWith("#< CLIXML") && !chunk.startsWith("<Objs")) {
+				process.stderr.write(`[screen-capture-test] ${chunk}`);
+			}
+		},
+	});
+	await new Promise((resolve) => setTimeout(resolve, 150));
+	await runPowerShell(buildMousePathScript(DURATION_MS));
+	await new Promise((resolve) => setTimeout(resolve, Math.max(250, SAMPLE_INTERVAL_MS * 3)));
+	await screenRecorder.done;
+} finally {
+	if (!sampler.child.killed) {
+		stoppingSampler = true;
+		sampler.child.kill();
+	}
+	if (screenRecorder && !screenRecorder.child.killed) {
+		screenRecorder.child.kill();
+	}
+}
+
+const samples = events.filter((event) => event.type === "sample");
+const errors = events.filter((event) => event.type === "error");
+const recordingStartTimestampMs = samples[0]?.timestampMs ?? Date.now();
+const uniquePositions = new Set(samples.map((sample) => `${sample.x},${sample.y}`));
+const report = {
+	outputDir: OUTPUT_DIR,
+	sampleIntervalMs: SAMPLE_INTERVAL_MS,
+	durationMs: DURATION_MS,
+	eventCount: events.length,
+	sampleCount: samples.length,
+	visibleSampleCount: samples.filter((sample) => sample.visible).length,
+	assetCount: assets.size,
+	uniqueCursorHandleCount: new Set(samples.map((sample) => sample.handle).filter(Boolean)).size,
+	uniquePositionCount: uniquePositions.size,
+	errorCount: errors.length,
+	firstSample: samples[0] ?? null,
+	lastSample: samples.at(-1) ?? null,
+	assets: [...assets.values()].map((asset) => ({
+		id: asset.id,
+		width: asset.width,
+		height: asset.height,
+		hotspotX: asset.hotspotX,
+		hotspotY: asset.hotspotY,
+	})),
+};
+const recordingData = toRecordingData(samples, assets);
+const screenFrames = readScreenFrames(OUTPUT_DIR, recordingStartTimestampMs);
+const reportHtmlPath = path.join(OUTPUT_DIR, "report.html");
+const previewVideoPath = path.join(OUTPUT_DIR, "preview.webm");
+const realCaptureHtmlPath = path.join(OUTPUT_DIR, "real-capture-report.html");
+const realCaptureVideoPath = path.join(OUTPUT_DIR, "real-capture-preview.webm");
+
+writeAssets(assets, OUTPUT_DIR);
+fs.writeFileSync(path.join(OUTPUT_DIR, "events.json"), JSON.stringify(events, null, 2));
+fs.writeFileSync(
+	path.join(OUTPUT_DIR, "cursor-recording-data.json"),
+	JSON.stringify(recordingData, null, 2),
+);
+fs.writeFileSync(path.join(OUTPUT_DIR, "report.json"), JSON.stringify(report, null, 2));
+fs.writeFileSync(reportHtmlPath, buildVisualReportHtml(report, recordingData));
+if (screenFrames.length > 0) {
+	fs.writeFileSync(realCaptureHtmlPath, buildRealCaptureHtml(report, recordingData, screenFrames));
+	report.screenFrameCount = screenFrames.length;
+}
+
+try {
+	await writePreviewVideo(reportHtmlPath, previewVideoPath);
+	report.previewVideoPath = previewVideoPath;
+} catch (error) {
+	report.previewVideoError = error instanceof Error ? error.message : String(error);
+}
+
+if (screenFrames.length > 0) {
+	try {
+		await writePreviewVideo(realCaptureHtmlPath, realCaptureVideoPath);
+		report.realCaptureVideoPath = realCaptureVideoPath;
+	} catch (error) {
+		report.realCaptureVideoError = error instanceof Error ? error.message : String(error);
+	}
+}
+
+fs.writeFileSync(path.join(OUTPUT_DIR, "report.json"), JSON.stringify(report, null, 2));
+
+assertReport(report);
+
+console.log(JSON.stringify(report, null, 2));
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index 442c04084..f8c9b294f 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -26,10 +26,10 @@ import {
 	type WebcamSizePreset,
 } from "@/lib/compositeLayout";
 import {
-	getNativeCursorDisplayMetrics,
 	hasNativeCursorRecordingData,
 	projectNativeCursorToStage,
 	resolveInterpolatedNativeCursorFrame,
+	resolveNativeCursorRenderAsset,
 } from "@/lib/cursor/nativeCursor";
 import { classifyWallpaper, DEFAULT_WALLPAPER, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { getCssClipPath } from "@/lib/webcamMaskShapes";
@@ -1436,19 +1436,20 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 								sample: frame.sample,
 							});
 							if (projectedPoint) {
-								const metrics = getNativeCursorDisplayMetrics(
+								const renderAsset = resolveNativeCursorRenderAsset(
 									frame.asset,
 									window.devicePixelRatio || 1,
+									frame.sample,
 								);
 								const scale = Math.max(0, cursorSizeRef.current);
-								if (nativeCursorImg.dataset.cursorId !== frame.asset.id) {
-									nativeCursorImg.src = frame.asset.imageDataUrl;
-									nativeCursorImg.dataset.cursorId = frame.asset.id;
+								if (nativeCursorImg.dataset.cursorId !== renderAsset.id) {
+									nativeCursorImg.src = renderAsset.imageDataUrl;
+									nativeCursorImg.dataset.cursorId = renderAsset.id;
 								}
-								nativeCursorImg.style.left = `${projectedPoint.x - metrics.hotspotX * scale}px`;
-								nativeCursorImg.style.top = `${projectedPoint.y - metrics.hotspotY * scale}px`;
-								nativeCursorImg.style.width = `${metrics.width * scale}px`;
-								nativeCursorImg.style.height = `${metrics.height * scale}px`;
+								nativeCursorImg.style.left = `${projectedPoint.x - renderAsset.hotspotX * scale}px`;
+								nativeCursorImg.style.top = `${projectedPoint.y - renderAsset.hotspotY * scale}px`;
+								nativeCursorImg.style.width = `${renderAsset.width * scale}px`;
+								nativeCursorImg.style.height = `${renderAsset.height * scale}px`;
 								nativeCursorImg.style.display = "block";
 							} else {
 								nativeCursorImg.style.display = "none";
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index b32bd9e04..d6ae22079 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -1,9 +1,20 @@
 import { type Container, Point } from "pixi.js";
+import crosshairUrl from "@/assets/cursors/Cursor=Cross.svg";
+import arrowUrl from "@/assets/cursors/Cursor=Default.svg";
+import pointerUrl from "@/assets/cursors/Cursor=Hand-(Pointing).svg";
+import notAllowedUrl from "@/assets/cursors/Cursor=Menu.svg";
+import moveUrl from "@/assets/cursors/Cursor=Move.svg";
+import resizeNeswUrl from "@/assets/cursors/Cursor=Resize-North-East-South-West.svg";
+import resizeNsUrl from "@/assets/cursors/Cursor=Resize-North-South.svg";
+import resizeNwseUrl from "@/assets/cursors/Cursor=Resize-North-West-South-East.svg";
+import resizeEwUrl from "@/assets/cursors/Cursor=Resize-West-East.svg";
+import textUrl from "@/assets/cursors/Cursor=Text-Cursor.svg";
 import type { CropRegion } from "@/components/video-editor/types";
 import type {
 	CursorRecordingData,
 	CursorRecordingSample,
 	NativeCursorAsset,
+	NativeCursorType,
 } from "@/native/contracts";
 
 export interface ActiveNativeCursorFrame {
@@ -23,6 +34,87 @@ function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
+interface PrettyNativeCursorAsset {
+	imageDataUrl: string;
+	width: number;
+	height: number;
+	hotspotX: number;
+	hotspotY: number;
+}
+
+const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNativeCursorAsset>> = {
+	arrow: {
+		imageDataUrl: arrowUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 5.8,
+		hotspotY: 3.2,
+	},
+	text: {
+		imageDataUrl: textUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	pointer: {
+		imageDataUrl: pointerUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 11.8,
+		hotspotY: 2.6,
+	},
+	crosshair: {
+		imageDataUrl: crosshairUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	"resize-ew": {
+		imageDataUrl: resizeEwUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	"resize-ns": {
+		imageDataUrl: resizeNsUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	"resize-nesw": {
+		imageDataUrl: resizeNeswUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	"resize-nwse": {
+		imageDataUrl: resizeNwseUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	move: {
+		imageDataUrl: moveUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	"not-allowed": {
+		imageDataUrl: notAllowedUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+};
+
 export function hasNativeCursorRecordingData(
 	recordingData: CursorRecordingData | null | undefined,
 ): recordingData is CursorRecordingData {
@@ -169,3 +261,39 @@ export function getNativeCursorDisplayMetrics(asset: NativeCursorAsset, deviceSc
 		hotspotY: asset.hotspotY / scaleFactor,
 	};
 }
+
+export function resolvePrettyNativeCursorAsset(
+	asset: NativeCursorAsset,
+	sample?: CursorRecordingSample,
+) {
+	const cursorType = sample?.cursorType ?? asset.cursorType ?? null;
+	return cursorType ? (PRETTY_NATIVE_CURSOR_ASSETS[cursorType] ?? null) : null;
+}
+
+export function resolveNativeCursorRenderAsset(
+	asset: NativeCursorAsset,
+	deviceScaleFactor: number,
+	sample?: CursorRecordingSample,
+) {
+	const prettyAsset = resolvePrettyNativeCursorAsset(asset, sample);
+	if (prettyAsset) {
+		return {
+			id: `pretty:${sample?.cursorType ?? asset.cursorType}`,
+			imageDataUrl: prettyAsset.imageDataUrl,
+			width: prettyAsset.width,
+			height: prettyAsset.height,
+			hotspotX: prettyAsset.hotspotX,
+			hotspotY: prettyAsset.hotspotY,
+		};
+	}
+
+	const metrics = getNativeCursorDisplayMetrics(asset, deviceScaleFactor);
+	return {
+		id: asset.id,
+		imageDataUrl: asset.imageDataUrl,
+		width: metrics.width,
+		height: metrics.height,
+		hotspotX: metrics.hotspotX,
+		hotspotY: metrics.hotspotY,
+	};
+}
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index f954977ce..6d9e78357 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -58,13 +58,13 @@ import {
 	type StyledRenderRect,
 } from "@/lib/compositeLayout";
 import {
-	getNativeCursorDisplayMetrics,
 	projectNativeCursorToStage,
 	resolveInterpolatedNativeCursorFrame,
+	resolveNativeCursorRenderAsset,
 } from "@/lib/cursor/nativeCursor";
 import { BackgroundLoadError, classifyWallpaper, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { drawCanvasClipPath } from "@/lib/webcamMaskShapes";
-import type { CursorRecordingData, NativeCursorAsset } from "@/native/contracts";
+import type { CursorRecordingData } from "@/native/contracts";
 import { renderAnnotations } from "./annotationRenderer";
 import {
 	getLinearGradientPoints,
@@ -586,19 +586,23 @@ export class FrameRenderer {
 			return;
 		}
 
-		const image = await this.getCursorImage(activeNativeCursor.asset);
-		const metrics = getNativeCursorDisplayMetrics(activeNativeCursor.asset, 1);
+		const renderAsset = resolveNativeCursorRenderAsset(
+			activeNativeCursor.asset,
+			1,
+			activeNativeCursor.sample,
+		);
+		const image = await this.getCursorImage(renderAsset);
 		const scale = Math.max(0, this.config.cursorScale ?? 1);
 		this.compositeCtx.drawImage(
 			image,
-			projectedPoint.x - metrics.hotspotX * scale,
-			projectedPoint.y - metrics.hotspotY * scale,
-			metrics.width * scale,
-			metrics.height * scale,
+			projectedPoint.x - renderAsset.hotspotX * scale,
+			projectedPoint.y - renderAsset.hotspotY * scale,
+			renderAsset.width * scale,
+			renderAsset.height * scale,
 		);
 	}
 
-	private async getCursorImage(asset: NativeCursorAsset) {
+	private async getCursorImage(asset: { id: string; imageDataUrl: string }) {
 		const cachedImage = this.cursorImageCache.get(asset.id);
 		if (cachedImage) {
 			return cachedImage;
diff --git a/src/native/contracts.ts b/src/native/contracts.ts
index 73d53dbbf..a3c908706 100644
--- a/src/native/contracts.ts
+++ b/src/native/contracts.ts
@@ -3,6 +3,21 @@ export const NATIVE_BRIDGE_VERSION = 1;
 
 export type NativePlatform = "darwin" | "win32" | "linux";
 export type CursorProviderKind = "native" | "none";
+export type NativeCursorType =
+	| "arrow"
+	| "text"
+	| "pointer"
+	| "crosshair"
+	| "resize-ew"
+	| "resize-ns"
+	| "resize-nesw"
+	| "resize-nwse"
+	| "move"
+	| "not-allowed"
+	| "wait"
+	| "app-starting"
+	| "help"
+	| "up-arrow";
 
 export interface CursorTelemetryPoint {
 	timeMs: number;
@@ -13,6 +28,7 @@ export interface CursorTelemetryPoint {
 export interface CursorRecordingSample extends CursorTelemetryPoint {
 	assetId?: string | null;
 	visible?: boolean;
+	cursorType?: NativeCursorType | null;
 }
 
 export interface NativeCursorAsset {
@@ -24,6 +40,7 @@ export interface NativeCursorAsset {
 	hotspotX: number;
 	hotspotY: number;
 	scaleFactor?: number;
+	cursorType?: NativeCursorType | null;
 }
 
 export interface CursorRecordingData {

From e48dd9cfe68c15329a71a7cb2760b39916298bdb Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 10:41:34 +0200
Subject: [PATCH 07/38] feat: complete windows cursor assets

---
 electron/ipc/handlers.ts                   | 80 +++-------------------
 src/assets/cursors/Cursor=App-Starting.svg |  8 +++
 src/assets/cursors/Cursor=Help.svg         |  8 +++
 src/assets/cursors/Cursor=Not-Allowed.svg  |  7 ++
 src/assets/cursors/Cursor=Up-Arrow.svg     |  4 ++
 src/assets/cursors/Cursor=Wait.svg         |  6 ++
 src/lib/cursor/nativeCursor.ts             | 34 ++++++++-
 7 files changed, 77 insertions(+), 70 deletions(-)
 create mode 100644 src/assets/cursors/Cursor=App-Starting.svg
 create mode 100644 src/assets/cursors/Cursor=Help.svg
 create mode 100644 src/assets/cursors/Cursor=Not-Allowed.svg
 create mode 100644 src/assets/cursors/Cursor=Up-Arrow.svg
 create mode 100644 src/assets/cursors/Cursor=Wait.svg

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 2694dc5e9..a2623a269 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-
+import type { DesktopCapturerSource } from "electron";
 import {
 	app,
 	BrowserWindow,
@@ -12,7 +12,6 @@ import {
 	shell,
 	systemPreferences,
 } from "electron";
-import type { DesktopCapturerSource } from "electron";
 import {
 	normalizeProjectMedia,
 	normalizeRecordingSession,
@@ -408,46 +407,6 @@ function setCurrentRecordingSessionState(session: RecordingSession | null) {
 	currentVideoPath = session?.screenVideoPath ?? null;
 }
 
-async function storeRecordedSessionFiles(payload: StoreRecordedSessionInput) {
-	const createdAt =
-		typeof payload.createdAt === "number" && Number.isFinite(payload.createdAt)
-			? payload.createdAt
-			: Date.now();
-	const screenVideoPath = resolveRecordingOutputPath(payload.screen.fileName);
-	await fs.writeFile(screenVideoPath, Buffer.from(payload.screen.videoData));
-
-	let webcamVideoPath: string | undefined;
-	if (payload.webcam) {
-		webcamVideoPath = resolveRecordingOutputPath(payload.webcam.fileName);
-		await fs.writeFile(webcamVideoPath, Buffer.from(payload.webcam.videoData));
-	}
-
-	const session: RecordingSession = webcamVideoPath
-		? { screenVideoPath, webcamVideoPath, createdAt }
-		: { screenVideoPath, createdAt };
-	setCurrentRecordingSessionState(session);
-	currentProjectPath = null;
-
-	const telemetryPath = `${screenVideoPath}.cursor.json`;
-	if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
-		await fs.writeFile(telemetryPath, JSON.stringify(pendingCursorRecordingData, null, 2), "utf-8");
-	}
-	pendingCursorRecordingData = null;
-
-	const sessionManifestPath = path.join(
-		RECORDINGS_DIR,
-		`${path.parse(payload.screen.fileName).name}${RECORDING_SESSION_SUFFIX}`,
-	);
-	await fs.writeFile(sessionManifestPath, JSON.stringify(session, null, 2), "utf-8");
-
-	return {
-		success: true,
-		path: screenVideoPath,
-		session,
-		message: "Recording session stored successfully",
-	};
-}
-
 export function registerIpcHandlers(
 	createEditorWindow: () => void,
 	createSourceSelectorWindow: () => BrowserWindow,
@@ -568,12 +527,12 @@ export function registerIpcHandlers(
 			typeof payload.createdAt === "number" && Number.isFinite(payload.createdAt)
 				? payload.createdAt
 				: Date.now();
-		const screenVideoPath = path.join(RECORDINGS_DIR, payload.screen.fileName);
+		const screenVideoPath = resolveRecordingOutputPath(payload.screen.fileName);
 		await fs.writeFile(screenVideoPath, Buffer.from(payload.screen.videoData));
 
 		let webcamVideoPath: string | undefined;
 		if (payload.webcam) {
-			webcamVideoPath = path.join(RECORDINGS_DIR, payload.webcam.fileName);
+			webcamVideoPath = resolveRecordingOutputPath(payload.webcam.fileName);
 			await fs.writeFile(webcamVideoPath, Buffer.from(payload.webcam.videoData));
 		}
 
@@ -581,7 +540,6 @@ export function registerIpcHandlers(
 			? { screenVideoPath, webcamVideoPath, createdAt }
 			: { screenVideoPath, createdAt };
 		setCurrentRecordingSessionState(session);
-		currentVideoPath = screenVideoPath;
 		currentProjectPath = null;
 
 		const telemetryPath = `${screenVideoPath}.cursor.json`;
@@ -594,6 +552,12 @@ export function registerIpcHandlers(
 		}
 		pendingCursorRecordingData = null;
 
+		const sessionManifestPath = path.join(
+			RECORDINGS_DIR,
+			`${path.parse(payload.screen.fileName).name}${RECORDING_SESSION_SUFFIX}`,
+		);
+		await fs.writeFile(sessionManifestPath, JSON.stringify(session, null, 2), "utf-8");
+
 		return {
 			success: true,
 			path: screenVideoPath,
@@ -929,18 +893,7 @@ export function registerIpcHandlers(
 			const content = await fs.readFile(filePath, "utf-8");
 			const project = JSON.parse(content);
 			currentProjectPath = filePath;
-			if (project && typeof project === "object") {
-				const rawProject = project as { media?: unknown; videoPath?: unknown };
-				const media =
-					normalizeProjectMedia(rawProject.media) ??
-					(typeof rawProject.videoPath === "string"
-						? {
-								screenVideoPath:
-									normalizeVideoSourcePath(rawProject.videoPath) ?? rawProject.videoPath,
-							}
-						: null);
-				setCurrentRecordingSessionState(media ? { ...media, createdAt: Date.now() } : null);
-			}
+			setCurrentRecordingSessionState(await getApprovedProjectSession(project, filePath));
 
 			return {
 				success: true,
@@ -969,18 +922,7 @@ export function registerIpcHandlers(
 
 			const content = await fs.readFile(currentProjectPath, "utf-8");
 			const project = JSON.parse(content);
-			if (project && typeof project === "object") {
-				const rawProject = project as { media?: unknown; videoPath?: unknown };
-				const media =
-					normalizeProjectMedia(rawProject.media) ??
-					(typeof rawProject.videoPath === "string"
-						? {
-								screenVideoPath:
-									normalizeVideoSourcePath(rawProject.videoPath) ?? rawProject.videoPath,
-							}
-						: null);
-				setCurrentRecordingSessionState(media ? { ...media, createdAt: Date.now() } : null);
-			}
+			setCurrentRecordingSessionState(await getApprovedProjectSession(project, currentProjectPath));
 			return {
 				success: true,
 				path: currentProjectPath,
diff --git a/src/assets/cursors/Cursor=App-Starting.svg b/src/assets/cursors/Cursor=App-Starting.svg
new file mode 100644
index 000000000..7a10d4080
--- /dev/null
+++ b/src/assets/cursors/Cursor=App-Starting.svg
@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.501 2.8601L15.884 11.2611C16.937 12.3171 16.19 14.1191 14.699 14.1191H13.475L14.6908 17.0067C14.9038 17.5127 14.9068 18.0727 14.6998 18.5817C14.4918 19.0917 14.0978 19.4897 13.5898 19.7027C13.3338 19.8097 13.0658 19.8637 12.7918 19.8637C11.9608 19.8637 11.2158 19.3687 10.8938 18.6027L9.616 15.565L8.784 16.3031C7.703 17.2591 6 16.4921 6 15.0481V3.4811C6 2.6971 6.947 2.3051 7.501 2.8601Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.9995 4.1292C6.9995 3.9982 7.1585 3.9322 7.2505 4.0252L15.1585 11.9502C15.5895 12.3822 15.2835 13.1192 14.6735 13.1192H11.9695L13.7691 17.3936C13.9961 17.9336 13.7421 18.5546 13.2031 18.7806C12.6621 19.0076 12.0421 18.7546 11.8161 18.2156L9.9985 13.8917L8.1385 15.5392C7.7225 15.9072 7.0806 15.6507 7.0065 15.1274L6.9995 15.0262V4.1292Z" fill="black"/>
+<circle cx="22" cy="22" r="7.25" stroke="white" stroke-width="3.5"/>
+<path d="M22 14.75C23.9228 14.75 25.7669 15.5138 27.1265 16.8735" stroke="black" stroke-width="2.3" stroke-linecap="round"/>
+<path d="M27.1265 16.8735C28.4862 18.2331 29.25 20.0772 29.25 22" stroke="#2563EB" stroke-width="2.3" stroke-linecap="round"/>
+<path d="M22 29.25C17.9959 29.25 14.75 26.0041 14.75 22" stroke="black" stroke-width="2.3" stroke-linecap="round" opacity="0.7"/>
+</svg>
diff --git a/src/assets/cursors/Cursor=Help.svg b/src/assets/cursors/Cursor=Help.svg
new file mode 100644
index 000000000..d187c5227
--- /dev/null
+++ b/src/assets/cursors/Cursor=Help.svg
@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.501 2.8601L15.884 11.2611C16.937 12.3171 16.19 14.1191 14.699 14.1191H13.475L14.6908 17.0067C14.9038 17.5127 14.9068 18.0727 14.6998 18.5817C14.4918 19.0917 14.0978 19.4897 13.5898 19.7027C13.3338 19.8097 13.0658 19.8637 12.7918 19.8637C11.9608 19.8637 11.2158 19.3687 10.8938 18.6027L9.616 15.565L8.784 16.3031C7.703 17.2591 6 16.4921 6 15.0481V3.4811C6 2.6971 6.947 2.3051 7.501 2.8601Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.9995 4.1292C6.9995 3.9982 7.1585 3.9322 7.2505 4.0252L15.1585 11.9502C15.5895 12.3822 15.2835 13.1192 14.6735 13.1192H11.9695L13.7691 17.3936C13.9961 17.9336 13.7421 18.5546 13.2031 18.7806C12.6621 19.0076 12.0421 18.7546 11.8161 18.2156L9.9985 13.8917L8.1385 15.5392C7.7225 15.9072 7.0806 15.6507 7.0065 15.1274L6.9995 15.0262V4.1292Z" fill="black"/>
+<circle cx="23" cy="22" r="7" fill="white"/>
+<path d="M23 28.25C26.4518 28.25 29.25 25.4518 29.25 22C29.25 18.5482 26.4518 15.75 23 15.75C19.5482 15.75 16.75 18.5482 16.75 22C16.75 25.4518 19.5482 28.25 23 28.25Z" stroke="black" stroke-width="1.8"/>
+<path d="M20.9 20.1C21.05 18.85 21.85 18.15 23.1 18.15C24.4 18.15 25.25 18.95 25.25 20.05C25.25 21.05 24.7 21.55 23.9 22.05C23.25 22.45 23 22.85 23 23.65" stroke="#2563EB" stroke-width="1.9" stroke-linecap="round"/>
+<circle cx="23" cy="25.8" r="1.15" fill="#2563EB"/>
+</svg>
diff --git a/src/assets/cursors/Cursor=Not-Allowed.svg b/src/assets/cursors/Cursor=Not-Allowed.svg
new file mode 100644
index 000000000..8b2c3f8f5
--- /dev/null
+++ b/src/assets/cursors/Cursor=Not-Allowed.svg
@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="16" cy="16" r="10.75" fill="white"/>
+<circle cx="16" cy="16" r="9.25" stroke="black" stroke-width="3"/>
+<path d="M9.55 22.45L22.45 9.55" stroke="black" stroke-width="3" stroke-linecap="round"/>
+<circle cx="16" cy="16" r="8.25" stroke="#DC2626" stroke-width="2"/>
+<path d="M10.25 21.75L21.75 10.25" stroke="#DC2626" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/src/assets/cursors/Cursor=Up-Arrow.svg b/src/assets/cursors/Cursor=Up-Arrow.svg
new file mode 100644
index 000000000..b742e7058
--- /dev/null
+++ b/src/assets/cursors/Cursor=Up-Arrow.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 2.5L7.25 12.25H12V28.5H20V12.25H24.75L16 2.5Z" fill="white" stroke="white" stroke-width="3" stroke-linejoin="round"/>
+<path d="M16 5.25L10 11.95H14V26.5H18V11.95H22L16 5.25Z" fill="black"/>
+</svg>
diff --git a/src/assets/cursors/Cursor=Wait.svg b/src/assets/cursors/Cursor=Wait.svg
new file mode 100644
index 000000000..2b569340c
--- /dev/null
+++ b/src/assets/cursors/Cursor=Wait.svg
@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="16" cy="16" r="10.5" stroke="white" stroke-width="4"/>
+<path d="M16 5.5C18.7848 5.5 21.4555 6.60625 23.4246 8.57538" stroke="black" stroke-width="3" stroke-linecap="round"/>
+<path d="M23.4246 8.57538C25.3938 10.5445 26.5 13.2152 26.5 16" stroke="#2563EB" stroke-width="3" stroke-linecap="round"/>
+<path d="M16 26.5C10.201 26.5 5.5 21.799 5.5 16" stroke="black" stroke-width="3" stroke-linecap="round" opacity="0.7"/>
+</svg>
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index d6ae22079..30f7a469b 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -1,14 +1,18 @@
 import { type Container, Point } from "pixi.js";
+import appStartingUrl from "@/assets/cursors/Cursor=App-Starting.svg";
 import crosshairUrl from "@/assets/cursors/Cursor=Cross.svg";
 import arrowUrl from "@/assets/cursors/Cursor=Default.svg";
 import pointerUrl from "@/assets/cursors/Cursor=Hand-(Pointing).svg";
-import notAllowedUrl from "@/assets/cursors/Cursor=Menu.svg";
+import helpUrl from "@/assets/cursors/Cursor=Help.svg";
 import moveUrl from "@/assets/cursors/Cursor=Move.svg";
+import notAllowedUrl from "@/assets/cursors/Cursor=Not-Allowed.svg";
 import resizeNeswUrl from "@/assets/cursors/Cursor=Resize-North-East-South-West.svg";
 import resizeNsUrl from "@/assets/cursors/Cursor=Resize-North-South.svg";
 import resizeNwseUrl from "@/assets/cursors/Cursor=Resize-North-West-South-East.svg";
 import resizeEwUrl from "@/assets/cursors/Cursor=Resize-West-East.svg";
 import textUrl from "@/assets/cursors/Cursor=Text-Cursor.svg";
+import upArrowUrl from "@/assets/cursors/Cursor=Up-Arrow.svg";
+import waitUrl from "@/assets/cursors/Cursor=Wait.svg";
 import type { CropRegion } from "@/components/video-editor/types";
 import type {
 	CursorRecordingData,
@@ -113,6 +117,34 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 		hotspotX: 16,
 		hotspotY: 16,
 	},
+	wait: {
+		imageDataUrl: waitUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 16,
+	},
+	"app-starting": {
+		imageDataUrl: appStartingUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 5.8,
+		hotspotY: 3.2,
+	},
+	help: {
+		imageDataUrl: helpUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 5.8,
+		hotspotY: 3.2,
+	},
+	"up-arrow": {
+		imageDataUrl: upArrowUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 3,
+	},
 };
 
 export function hasNativeCursorRecordingData(

From f6ef620050757444ede9c519f2c58e8b7bf06b3d Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 10:50:20 +0200
Subject: [PATCH 08/38] fix: avoid unsupported display media min constraint

---
 src/hooks/useScreenRecorder.ts | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index d710a6051..7cd86a7a6 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -5,7 +5,6 @@ import { useScopedT } from "@/contexts/I18nContext";
 import { requestCameraAccess } from "@/lib/requestCameraAccess";
 
 const TARGET_FRAME_RATE = 60;
-const MIN_FRAME_RATE = 30;
 const TARGET_WIDTH = 3840;
 const TARGET_HEIGHT = 2160;
 const FOUR_K_PIXELS = TARGET_WIDTH * TARGET_HEIGHT;
@@ -407,6 +406,14 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		}
 	});
 
+	const safeHideCountdownOverlay = useCallback(async (runId: number) => {
+		try {
+			await window.electronAPI.hideCountdownOverlay(runId);
+		} catch (error) {
+			console.warn("Failed to hide countdown overlay:", error);
+		}
+	}, []);
+
 	useEffect(() => {
 		let cleanup: (() => void) | undefined;
 
@@ -449,7 +456,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			webcamRecorder.current = null;
 			teardownMedia();
 		};
-	}, [teardownMedia]);
+	}, [teardownMedia, safeHideCountdownOverlay]);
 
 	const safeShowCountdownOverlay = async (value: number, runId: number) => {
 		try {
@@ -476,14 +483,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		}
 	};
 
-	const safeHideCountdownOverlay = async (runId: number) => {
-		try {
-			await window.electronAPI.hideCountdownOverlay(runId);
-		} catch (error) {
-			console.warn("Failed to hide countdown overlay:", error);
-		}
-	};
-
 	const isCountdownRunActive = (runId?: number) =>
 		runId === undefined || countdownRunId.current === runId;
 
@@ -585,7 +584,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 					cursor: "never",
 					width: { max: TARGET_WIDTH },
 					height: { max: TARGET_HEIGHT },
-					frameRate: { ideal: TARGET_FRAME_RATE, min: MIN_FRAME_RATE },
+					frameRate: { ideal: TARGET_FRAME_RATE },
 				} as MediaTrackConstraints,
 				audio: systemAudioEnabled,
 			} as DisplayMediaStreamOptions);

From 58a1a791254af1ad9a9c72e45cc93d707f267f0a Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 11:04:08 +0200
Subject: [PATCH 09/38] fix: align native cursor preview and export

---
 electron/ipc/handlers.ts                      | 31 ++++++++-
 .../native-bridge/cursor/recording/factory.ts |  3 +
 .../recording/telemetryRecordingSession.ts    |  3 +-
 .../windowsNativeRecordingSession.ts          |  2 +-
 .../windowsNativeRecordingSession.types.ts    |  1 +
 scripts/capture-openscreen-preview.mjs        |  4 --
 src/components/video-editor/VideoPlayback.tsx | 67 ++++++++-----------
 src/hooks/useScreenRecorder.ts                |  6 +-
 src/lib/cursor/nativeCursor.ts                | 19 ++++--
 9 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index a2623a269..125315906 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -607,7 +607,7 @@ export function registerIpcHandlers(
 		}
 	});
 
-	ipcMain.handle("set-recording-state", async (_, recording: boolean) => {
+	ipcMain.handle("set-recording-state", async (_, recording: boolean, recordingId?: number) => {
 		if (recording) {
 			if (cursorRecordingSession) {
 				pendingCursorRecordingData = await cursorRecordingSession.stop();
@@ -621,6 +621,8 @@ export function registerIpcHandlers(
 				platform: process.platform,
 				sampleIntervalMs: CURSOR_SAMPLE_INTERVAL_MS,
 				sourceId: getSelectedSourceId(),
+				startTimeMs:
+					typeof recordingId === "number" && Number.isFinite(recordingId) ? recordingId : undefined,
 			});
 
 			try {
@@ -743,6 +745,7 @@ export function registerIpcHandlers(
 				return { success: false, canceled: true };
 			}
 
+			approveFilePath(result.filePaths[0]);
 			currentProjectPath = null;
 			return {
 				success: true,
@@ -782,6 +785,32 @@ export function registerIpcHandlers(
 		}
 	});
 
+	ipcMain.handle("read-binary-file", async (_, filePath: string) => {
+		try {
+			const normalizedPath = await approveReadableVideoPath(filePath);
+			if (!normalizedPath) {
+				return {
+					success: false,
+					message: "File path is not approved or is not a supported video file",
+				};
+			}
+
+			const data = await fs.readFile(normalizedPath);
+			return {
+				success: true,
+				data: data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength),
+				path: normalizedPath,
+			};
+		} catch (error) {
+			console.error("Failed to read binary file:", error);
+			return {
+				success: false,
+				message: "Failed to read binary file",
+				error: String(error),
+			};
+		}
+	});
+
 	ipcMain.handle(
 		"save-project-file",
 		async (_, projectData: unknown, suggestedName?: string, existingProjectPath?: string) => {
diff --git a/electron/native-bridge/cursor/recording/factory.ts b/electron/native-bridge/cursor/recording/factory.ts
index 4e0f75c01..52d607909 100644
--- a/electron/native-bridge/cursor/recording/factory.ts
+++ b/electron/native-bridge/cursor/recording/factory.ts
@@ -9,6 +9,7 @@ interface CreateCursorRecordingSessionOptions {
 	platform: NodeJS.Platform;
 	sampleIntervalMs: number;
 	sourceId?: string | null;
+	startTimeMs?: number;
 }
 
 export function createCursorRecordingSession(
@@ -20,6 +21,7 @@ export function createCursorRecordingSession(
 			maxSamples: options.maxSamples,
 			sampleIntervalMs: options.sampleIntervalMs,
 			sourceId: options.sourceId,
+			startTimeMs: options.startTimeMs,
 		});
 	}
 
@@ -27,5 +29,6 @@ export function createCursorRecordingSession(
 		getDisplayBounds: options.getDisplayBounds,
 		maxSamples: options.maxSamples,
 		sampleIntervalMs: options.sampleIntervalMs,
+		startTimeMs: options.startTimeMs,
 	});
 }
diff --git a/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts b/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts
index dd42871bd..e719d8ee3 100644
--- a/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/telemetryRecordingSession.ts
@@ -6,6 +6,7 @@ interface TelemetryRecordingSessionOptions {
 	getDisplayBounds: () => Rectangle | null;
 	maxSamples: number;
 	sampleIntervalMs: number;
+	startTimeMs?: number;
 }
 
 function clamp(value: number, min: number, max: number) {
@@ -21,7 +22,7 @@ export class TelemetryRecordingSession implements CursorRecordingSession {
 
 	async start(): Promise<void> {
 		this.samples = [];
-		this.startTimeMs = Date.now();
+		this.startTimeMs = this.options.startTimeMs ?? Date.now();
 		this.captureSample();
 		this.interval = setInterval(() => {
 			this.captureSample();
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index 632a74d5e..8075fe30f 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -41,7 +41,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		this.assets.clear();
 		this.samples = [];
 		this.lineBuffer = "";
-		this.startTimeMs = Date.now();
+		this.startTimeMs = this.options.startTimeMs ?? Date.now();
 		this.sampleCount = 0;
 		this.outOfBoundsSampleCount = 0;
 
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
index fdc4ab93a..5afc012e7 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -49,4 +49,5 @@ export interface WindowsNativeRecordingSessionOptions {
 	maxSamples: number;
 	sampleIntervalMs: number;
 	sourceId?: string | null;
+	startTimeMs?: number;
 }
diff --git a/scripts/capture-openscreen-preview.mjs b/scripts/capture-openscreen-preview.mjs
index 6c9b6ebf1..25f86db59 100644
--- a/scripts/capture-openscreen-preview.mjs
+++ b/scripts/capture-openscreen-preview.mjs
@@ -214,10 +214,6 @@ try {
 	await editorWindow.waitForLoadState("domcontentloaded");
 	await editorWindow.waitForSelector("video", { state: "attached", timeout: 30_000 });
 	await editorWindow.waitForSelector("canvas", { state: "attached", timeout: 30_000 });
-	await editorWindow.waitForSelector('img[aria-hidden="true"]', {
-		state: "attached",
-		timeout: 30_000,
-	});
 
 	await editorWindow.setViewportSize({ width: 1280, height: 800 });
 	await editorWindow.evaluate(async () => {
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index f8c9b294f..97e4509ec 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -27,7 +27,7 @@ import {
 } from "@/lib/compositeLayout";
 import {
 	hasNativeCursorRecordingData,
-	projectNativeCursorToStage,
+	projectNativeCursorToLocal,
 	resolveInterpolatedNativeCursorFrame,
 	resolveNativeCursorRenderAsset,
 } from "@/lib/cursor/nativeCursor";
@@ -315,7 +315,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const hasNativeCursorRecordingRef = useRef(false);
 		const cursorRecordingDataRef = useRef(cursorRecordingData);
 		const cropRegionRef = useRef(cropRegion);
-		const nativeCursorImgRef = useRef<HTMLImageElement | null>(null);
+		const nativeCursorSpriteRef = useRef<Sprite | null>(null);
+		const nativeCursorTextureIdRef = useRef<string | null>(null);
 
 		const hasNativeCursorRecording = useMemo(
 			() => hasNativeCursorRecordingData(cursorRecordingData),
@@ -953,6 +954,12 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				cursorContainerRef.current = cursorContainer;
 				cameraContainer.addChild(cursorContainer);
 
+				const nativeCursorSprite = new Sprite(Texture.EMPTY);
+				nativeCursorSprite.visible = false;
+				nativeCursorSprite.eventMode = "none";
+				nativeCursorSpriteRef.current = nativeCursorSprite;
+				cursorContainer.addChild(nativeCursorSprite);
+
 				// Cursor overlay - rendered above the masked video
 				if (cursorOverlayEnabled) {
 					const cursorOverlay = new PixiCursorOverlay({
@@ -975,6 +982,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					cursorOverlayRef.current.destroy();
 					cursorOverlayRef.current = null;
 				}
+				nativeCursorSpriteRef.current = null;
+				nativeCursorTextureIdRef.current = null;
 				if (app && app.renderer) {
 					app.destroy(true, {
 						children: true,
@@ -1408,25 +1417,18 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					);
 				}
 
-				// Update native cursor image position at ticker rate (60fps)
-				const nativeCursorImg = nativeCursorImgRef.current;
-				if (nativeCursorImg) {
-					const cameraContainerRc = cameraContainerRef.current;
+				// Update native cursor sprite in the same PIXI coordinate space as the video.
+				const nativeCursorSprite = nativeCursorSpriteRef.current;
+				if (nativeCursorSprite) {
 					const videoContainerRc = videoContainerRef.current;
-					if (
-						hasNativeCursorRecordingRef.current &&
-						showCursorRef.current &&
-						cameraContainerRc &&
-						videoContainerRc
-					) {
+					if (hasNativeCursorRecordingRef.current && showCursorRef.current && videoContainerRc) {
 						const timeMs = currentTimeRef.current; // already in ms
 						const frame = resolveInterpolatedNativeCursorFrame(
 							cursorRecordingDataRef.current,
 							timeMs,
 						);
 						if (frame) {
-							const projectedPoint = projectNativeCursorToStage({
-								cameraContainer: cameraContainerRc,
+							const projectedPoint = projectNativeCursorToLocal({
 								cropRegion: cropRegionRef.current ?? { x: 0, y: 0, width: 1, height: 1 },
 								maskRect: baseMaskRef.current,
 								videoContainerPosition: {
@@ -1442,23 +1444,25 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 									frame.sample,
 								);
 								const scale = Math.max(0, cursorSizeRef.current);
-								if (nativeCursorImg.dataset.cursorId !== renderAsset.id) {
-									nativeCursorImg.src = renderAsset.imageDataUrl;
-									nativeCursorImg.dataset.cursorId = renderAsset.id;
+								if (nativeCursorTextureIdRef.current !== renderAsset.id) {
+									nativeCursorSprite.texture = Texture.from(renderAsset.imageDataUrl);
+									nativeCursorTextureIdRef.current = renderAsset.id;
 								}
-								nativeCursorImg.style.left = `${projectedPoint.x - renderAsset.hotspotX * scale}px`;
-								nativeCursorImg.style.top = `${projectedPoint.y - renderAsset.hotspotY * scale}px`;
-								nativeCursorImg.style.width = `${renderAsset.width * scale}px`;
-								nativeCursorImg.style.height = `${renderAsset.height * scale}px`;
-								nativeCursorImg.style.display = "block";
+								nativeCursorSprite.position.set(
+									projectedPoint.x - renderAsset.hotspotX * scale,
+									projectedPoint.y - renderAsset.hotspotY * scale,
+								);
+								nativeCursorSprite.width = renderAsset.width * scale;
+								nativeCursorSprite.height = renderAsset.height * scale;
+								nativeCursorSprite.visible = true;
 							} else {
-								nativeCursorImg.style.display = "none";
+								nativeCursorSprite.visible = false;
 							}
 						} else {
-							nativeCursorImg.style.display = "none";
+							nativeCursorSprite.visible = false;
 						}
 					} else {
-						nativeCursorImg.style.display = "none";
+						nativeCursorSprite.visible = false;
 					}
 				}
 
@@ -1750,19 +1754,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 								className="absolute rounded-md border border-[#34B27B]/80 bg-[#34B27B]/20 shadow-[0_0_0_1px_rgba(52,178,123,0.35)]"
 								style={{ display: "none", pointerEvents: "none" }}
 							/>
-							{hasNativeCursorRecording ? (
-								<img
-									ref={nativeCursorImgRef}
-									alt=""
-									aria-hidden="true"
-									className="absolute select-none"
-									style={{
-										display: "none",
-										pointerEvents: "none",
-										userSelect: "none",
-									}}
-								/>
-							) : null}
 							{(() => {
 								const filteredAnnotations = (annotationRegions || []).filter((annotation) => {
 									if (
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 7cd86a7a6..717a6cdf0 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -719,6 +719,8 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 				return;
 			}
 
+			recordingId.current = Date.now();
+			const activeRecordingId = recordingId.current;
 			screenRecorder.current = createRecorderHandle(stream.current, {
 				mimeType,
 				videoBitsPerSecond,
@@ -741,9 +743,8 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 				});
 			}
 
-			recordingId.current = Date.now();
 			accumulatedDurationMs.current = 0;
-			segmentStartedAt.current = Date.now();
+			segmentStartedAt.current = activeRecordingId;
 			allowAutoFinalize.current = true;
 			setRecording(true);
 			setPaused(false);
@@ -752,7 +753,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 
 			const activeScreenRecorder = screenRecorder.current;
 			const activeWebcamRecorder = webcamRecorder.current;
-			const activeRecordingId = recordingId.current;
 			if (activeScreenRecorder) {
 				activeScreenRecorder.recorder.addEventListener(
 					"stop",
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 30f7a469b..5c38c4d90 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -27,13 +27,16 @@ export interface ActiveNativeCursorFrame {
 }
 
 interface ProjectNativeCursorOptions {
-	cameraContainer: Container;
 	cropRegion: CropRegion;
 	maskRect: { x: number; y: number; width: number; height: number };
 	videoContainerPosition: { x: number; y: number };
 	sample: CursorRecordingSample;
 }
 
+interface ProjectNativeCursorToStageOptions extends ProjectNativeCursorOptions {
+	cameraContainer: Container;
+}
+
 function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
@@ -264,8 +267,7 @@ export function resolveInterpolatedNativeCursorFrame(
 	};
 }
 
-export function projectNativeCursorToStage({
-	cameraContainer,
+export function projectNativeCursorToLocal({
 	cropRegion,
 	maskRect,
 	videoContainerPosition,
@@ -276,11 +278,20 @@ export function projectNativeCursorToStage({
 		return null;
 	}
 
-	const localPoint = new Point(
+	return new Point(
 		videoContainerPosition.x + maskRect.x + croppedPosition.cx * maskRect.width,
 		videoContainerPosition.y + maskRect.y + croppedPosition.cy * maskRect.height,
 	);
+}
 
+export function projectNativeCursorToStage({
+	cameraContainer,
+	...options
+}: ProjectNativeCursorToStageOptions) {
+	const localPoint = projectNativeCursorToLocal(options);
+	if (!localPoint) {
+		return null;
+	}
 	return cameraContainer.toGlobal(localPoint);
 }
 

From e414f6a336dbf1fc38d9fcee9b035c30acb2575f Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 11:38:50 +0200
Subject: [PATCH 10/38] fix: restore native cursor preview and export

---
 src/components/video-editor/VideoPlayback.tsx | 129 ++++++++++++------
 src/lib/cursor/nativeCursor.ts                |  26 +++-
 src/lib/exporter/frameRenderer.ts             |  24 ++--
 3 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index 97e4509ec..83269ee08 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -28,6 +28,7 @@ import {
 import {
 	hasNativeCursorRecordingData,
 	projectNativeCursorToLocal,
+	projectNativeCursorToStage,
 	resolveInterpolatedNativeCursorFrame,
 	resolveNativeCursorRenderAsset,
 } from "@/lib/cursor/nativeCursor";
@@ -242,7 +243,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const videoSpriteRef = useRef<Sprite | null>(null);
 		const videoContainerRef = useRef<Container | null>(null);
 		const cameraContainerRef = useRef<Container | null>(null);
-		const cursorContainerRef = useRef<Container | null>(null);
 		const timeUpdateAnimationRef = useRef<number | null>(null);
 		const [pixiReady, setPixiReady] = useState(false);
 		const [videoReady, setVideoReady] = useState(false);
@@ -317,6 +317,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const cropRegionRef = useRef(cropRegion);
 		const nativeCursorSpriteRef = useRef<Sprite | null>(null);
 		const nativeCursorTextureIdRef = useRef<string | null>(null);
+		const nativeCursorImageRef = useRef<HTMLImageElement | null>(null);
+		const nativeCursorImageIdRef = useRef<string | null>(null);
 
 		const hasNativeCursorRecording = useMemo(
 			() => hasNativeCursorRecordingData(cursorRecordingData),
@@ -949,17 +951,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				videoContainerRef.current = videoContainer;
 				cameraContainer.addChild(videoContainer);
 
-				// Cursor container - rendered above video
-				const cursorContainer = new Container();
-				cursorContainerRef.current = cursorContainer;
-				cameraContainer.addChild(cursorContainer);
-
-				const nativeCursorSprite = new Sprite(Texture.EMPTY);
-				nativeCursorSprite.visible = false;
-				nativeCursorSprite.eventMode = "none";
-				nativeCursorSpriteRef.current = nativeCursorSprite;
-				cursorContainer.addChild(nativeCursorSprite);
-
 				// Cursor overlay - rendered above the masked video
 				if (cursorOverlayEnabled) {
 					const cursorOverlay = new PixiCursorOverlay({
@@ -969,7 +960,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 						clickBounce: cursorClickBounceRef.current,
 					});
 					cursorOverlayRef.current = cursorOverlay;
-					cursorContainer.addChild(cursorOverlay.container);
 				}
 
 				setPixiReady(true);
@@ -984,6 +974,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				}
 				nativeCursorSpriteRef.current = null;
 				nativeCursorTextureIdRef.current = null;
+				nativeCursorImageIdRef.current = null;
 				if (app && app.renderer) {
 					app.destroy(true, {
 						children: true,
@@ -994,7 +985,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 				appRef.current = null;
 				cameraContainerRef.current = null;
 				videoContainerRef.current = null;
-				cursorContainerRef.current = null;
 				videoSpriteRef.current = null;
 			};
 		}, []);
@@ -1033,9 +1023,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			const video = videoRef.current;
 			const app = appRef.current;
 			const videoContainer = videoContainerRef.current;
-			const cursorContainer = cursorContainerRef.current;
 
-			if (!video || !app || !videoContainer || !cursorContainer) return;
+			if (!video || !app || !videoContainer) return;
 			if (video.videoWidth === 0 || video.videoHeight === 0) return;
 
 			const source = VideoSource.from(video);
@@ -1055,8 +1044,12 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			videoContainer.addChild(maskGraphics);
 			videoContainer.mask = maskGraphics;
 			maskGraphicsRef.current = maskGraphics;
+			const nativeCursorSprite = new Sprite(Texture.EMPTY);
+			nativeCursorSprite.visible = false;
+			nativeCursorSprite.eventMode = "none";
+			nativeCursorSpriteRef.current = nativeCursorSprite;
 			if (cursorOverlayRef.current) {
-				cursorContainer.addChild(cursorOverlayRef.current.container);
+				videoContainer.addChild(cursorOverlayRef.current.container);
 			}
 
 			const cursorHighlightGraphics = new Graphics();
@@ -1064,6 +1057,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 			videoContainer.addChild(cursorHighlightGraphics);
 			cursorHighlightGraphicsRef.current = cursorHighlightGraphics;
 			drawCursorHighlightGraphics(cursorHighlightGraphics, cursorHighlightRef.current);
+			videoContainer.addChild(nativeCursorSprite);
 
 			animationStateRef.current = {
 				scale: 1,
@@ -1132,6 +1126,12 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					cursorHighlightGraphicsRef.current.destroy();
 					cursorHighlightGraphicsRef.current = null;
 				}
+				if (nativeCursorSpriteRef.current) {
+					videoContainer.removeChild(nativeCursorSpriteRef.current);
+					nativeCursorSpriteRef.current.destroy();
+					nativeCursorSpriteRef.current = null;
+					nativeCursorTextureIdRef.current = null;
+				}
 				videoContainer.mask = null;
 				maskGraphicsRef.current = null;
 				if (blurFilterRef.current) {
@@ -1417,53 +1417,88 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					);
 				}
 
-				// Update native cursor sprite in the same PIXI coordinate space as the video.
+				// Keep the native cursor preview in the same transformed coordinate space as PIXI.
 				const nativeCursorSprite = nativeCursorSpriteRef.current;
-				if (nativeCursorSprite) {
-					const videoContainerRc = videoContainerRef.current;
-					if (hasNativeCursorRecordingRef.current && showCursorRef.current && videoContainerRc) {
+				const nativeCursorImage = nativeCursorImageRef.current;
+				const hideNativeCursorPreview = () => {
+					if (nativeCursorSprite) {
+						nativeCursorSprite.visible = false;
+					}
+					if (nativeCursorImage) {
+						nativeCursorImage.style.display = "none";
+					}
+				};
+				if (nativeCursorImage) {
+					if (hasNativeCursorRecordingRef.current && showCursorRef.current) {
 						const timeMs = currentTimeRef.current; // already in ms
 						const frame = resolveInterpolatedNativeCursorFrame(
 							cursorRecordingDataRef.current,
 							timeMs,
 						);
 						if (frame) {
-							const projectedPoint = projectNativeCursorToLocal({
-								cropRegion: cropRegionRef.current ?? { x: 0, y: 0, width: 1, height: 1 },
+							const cameraContainer = cameraContainerRef.current;
+							const videoContainer = videoContainerRef.current;
+							const cropRegionValue = cropRegionRef.current ?? { x: 0, y: 0, width: 1, height: 1 };
+							const projectedLocalPoint = projectNativeCursorToLocal({
+								cropRegion: cropRegionValue,
 								maskRect: baseMaskRef.current,
-								videoContainerPosition: {
-									x: videoContainerRc.x,
-									y: videoContainerRc.y,
-								},
 								sample: frame.sample,
 							});
-							if (projectedPoint) {
+							const projectedStagePoint =
+								cameraContainer && videoContainer
+									? projectNativeCursorToStage({
+											cameraContainer,
+											cropRegion: cropRegionValue,
+											maskRect: baseMaskRef.current,
+											videoContainerPosition: {
+												x: videoContainer.x,
+												y: videoContainer.y,
+											},
+											sample: frame.sample,
+										})
+									: null;
+							if (projectedLocalPoint && projectedStagePoint) {
 								const renderAsset = resolveNativeCursorRenderAsset(
 									frame.asset,
 									window.devicePixelRatio || 1,
 									frame.sample,
 								);
 								const scale = Math.max(0, cursorSizeRef.current);
-								if (nativeCursorTextureIdRef.current !== renderAsset.id) {
-									nativeCursorSprite.texture = Texture.from(renderAsset.imageDataUrl);
-									nativeCursorTextureIdRef.current = renderAsset.id;
+								const transformedScale = scale * Math.abs(cameraContainer?.scale.x || 1);
+								if (nativeCursorImageIdRef.current !== renderAsset.id) {
+									nativeCursorImage.src = renderAsset.imageDataUrl;
+									nativeCursorImageIdRef.current = renderAsset.id;
+								}
+								nativeCursorImage.style.display = "block";
+								nativeCursorImage.style.width = `${renderAsset.width * transformedScale}px`;
+								nativeCursorImage.style.height = `${renderAsset.height * transformedScale}px`;
+								nativeCursorImage.style.transform = `translate3d(${
+									projectedStagePoint.x - renderAsset.hotspotX * transformedScale
+								}px, ${projectedStagePoint.y - renderAsset.hotspotY * transformedScale}px, 0)`;
+								if (nativeCursorSprite) {
+									nativeCursorSprite.visible = false;
+									if (nativeCursorTextureIdRef.current !== renderAsset.id) {
+										nativeCursorSprite.texture = Texture.from(renderAsset.imageDataUrl);
+										nativeCursorTextureIdRef.current = renderAsset.id;
+									}
+									nativeCursorSprite.position.set(
+										projectedLocalPoint.x - renderAsset.hotspotX * scale,
+										projectedLocalPoint.y - renderAsset.hotspotY * scale,
+									);
+									nativeCursorSprite.width = renderAsset.width * scale;
+									nativeCursorSprite.height = renderAsset.height * scale;
 								}
-								nativeCursorSprite.position.set(
-									projectedPoint.x - renderAsset.hotspotX * scale,
-									projectedPoint.y - renderAsset.hotspotY * scale,
-								);
-								nativeCursorSprite.width = renderAsset.width * scale;
-								nativeCursorSprite.height = renderAsset.height * scale;
-								nativeCursorSprite.visible = true;
 							} else {
-								nativeCursorSprite.visible = false;
+								hideNativeCursorPreview();
 							}
 						} else {
-							nativeCursorSprite.visible = false;
+							hideNativeCursorPreview();
 						}
 					} else {
-						nativeCursorSprite.visible = false;
+						hideNativeCursorPreview();
 					}
+				} else {
+					hideNativeCursorPreview();
 				}
 
 				const composite3D = composite3DRef.current;
@@ -1697,6 +1732,18 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 									: "none",
 						}}
 					/>
+					<img
+						ref={nativeCursorImageRef}
+						alt=""
+						aria-hidden="true"
+						className="absolute left-0 top-0 select-none"
+						style={{
+							display: "none",
+							pointerEvents: "none",
+							transformOrigin: "0 0",
+							zIndex: 18,
+						}}
+					/>
 					{webcamVideoPath &&
 						(() => {
 							const clipPath = getCssClipPath(webcamLayout?.maskShape ?? "rectangle");
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 5c38c4d90..3b62cb854 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -29,12 +29,12 @@ export interface ActiveNativeCursorFrame {
 interface ProjectNativeCursorOptions {
 	cropRegion: CropRegion;
 	maskRect: { x: number; y: number; width: number; height: number };
-	videoContainerPosition: { x: number; y: number };
 	sample: CursorRecordingSample;
 }
 
 interface ProjectNativeCursorToStageOptions extends ProjectNativeCursorOptions {
 	cameraContainer: Container;
+	videoContainerPosition: { x: number; y: number };
 }
 
 function clamp(value: number, min: number, max: number) {
@@ -179,6 +179,15 @@ function getCroppedCursorPosition(sample: CursorRecordingSample, cropRegion: Cro
 	};
 }
 
+function getNativeCursorMaskPoint(sample: CursorRecordingSample, cropRegion: CropRegion) {
+	const croppedPosition = getCroppedCursorPosition(sample, cropRegion);
+	if (!croppedPosition) {
+		return null;
+	}
+
+	return new Point(croppedPosition.cx, croppedPosition.cy);
+}
+
 export function resolveActiveNativeCursorFrame(
 	recordingData: CursorRecordingData | null | undefined,
 	timeMs: number,
@@ -270,29 +279,32 @@ export function resolveInterpolatedNativeCursorFrame(
 export function projectNativeCursorToLocal({
 	cropRegion,
 	maskRect,
-	videoContainerPosition,
 	sample,
 }: ProjectNativeCursorOptions) {
-	const croppedPosition = getCroppedCursorPosition(sample, cropRegion);
-	if (!croppedPosition) {
+	const maskPoint = getNativeCursorMaskPoint(sample, cropRegion);
+	if (!maskPoint) {
 		return null;
 	}
 
 	return new Point(
-		videoContainerPosition.x + maskRect.x + croppedPosition.cx * maskRect.width,
-		videoContainerPosition.y + maskRect.y + croppedPosition.cy * maskRect.height,
+		maskRect.x + maskPoint.x * maskRect.width,
+		maskRect.y + maskPoint.y * maskRect.height,
 	);
 }
 
 export function projectNativeCursorToStage({
 	cameraContainer,
+	videoContainerPosition,
 	...options
 }: ProjectNativeCursorToStageOptions) {
 	const localPoint = projectNativeCursorToLocal(options);
 	if (!localPoint) {
 		return null;
 	}
-	return cameraContainer.toGlobal(localPoint);
+
+	return cameraContainer.toGlobal(
+		new Point(localPoint.x + videoContainerPosition.x, localPoint.y + videoContainerPosition.y),
+	);
 }
 
 export function getNativeCursorDisplayMetrics(asset: NativeCursorAsset, deviceScaleFactor: number) {
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index 6d9e78357..eaee4c9f9 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -58,7 +58,7 @@ import {
 	type StyledRenderRect,
 } from "@/lib/compositeLayout";
 import {
-	projectNativeCursorToStage,
+	projectNativeCursorToLocal,
 	resolveInterpolatedNativeCursorFrame,
 	resolveNativeCursorRenderAsset,
 } from "@/lib/cursor/nativeCursor";
@@ -556,7 +556,7 @@ export class FrameRenderer {
 	}
 
 	private async drawNativeCursor(timeMs: number) {
-		if (!this.compositeCtx || !this.cameraContainer || !this.videoContainer || !this.layoutCache) {
+		if (!this.foregroundCtx || !this.layoutCache) {
 			return;
 		}
 
@@ -572,14 +572,9 @@ export class FrameRenderer {
 			return;
 		}
 
-		const projectedPoint = projectNativeCursorToStage({
-			cameraContainer: this.cameraContainer,
+		const projectedPoint = projectNativeCursorToLocal({
 			cropRegion: this.config.cropRegion,
 			maskRect: this.layoutCache.maskRect,
-			videoContainerPosition: {
-				x: this.videoContainer.x,
-				y: this.videoContainer.y,
-			},
 			sample: activeNativeCursor.sample,
 		});
 		if (!projectedPoint) {
@@ -593,12 +588,15 @@ export class FrameRenderer {
 		);
 		const image = await this.getCursorImage(renderAsset);
 		const scale = Math.max(0, this.config.cursorScale ?? 1);
-		this.compositeCtx.drawImage(
+		const appliedScale = this.animationState.appliedScale;
+		const canvasX = projectedPoint.x * appliedScale + this.animationState.x;
+		const canvasY = projectedPoint.y * appliedScale + this.animationState.y;
+		this.foregroundCtx.drawImage(
 			image,
-			projectedPoint.x - renderAsset.hotspotX * scale,
-			projectedPoint.y - renderAsset.hotspotY * scale,
-			renderAsset.width * scale,
-			renderAsset.height * scale,
+			canvasX - renderAsset.hotspotX * scale * appliedScale,
+			canvasY - renderAsset.hotspotY * scale * appliedScale,
+			renderAsset.width * scale * appliedScale,
+			renderAsset.height * scale * appliedScale,
 		);
 	}
 

From 7166160e316d837375b7b90174804b72ac155844 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 16:07:07 +0200
Subject: [PATCH 11/38] feat: add native Windows recorder helper

---
 .gitignore                                    |  98 ++--
 .../windows-native-recorder-roadmap.md        | 202 +++++++
 docs/testing/windows-native-cursor.md         |  34 ++
 electron-builder.json5                        |  18 +-
 electron/electron-env.d.ts                    |  18 +
 electron/ipc/handlers.ts                      | 543 ++++++++++++++++--
 electron/native/README.md                     |  50 ++
 electron/native/wgc-capture/CMakeLists.txt    |  45 ++
 electron/native/wgc-capture/src/main.cpp      | 433 ++++++++++++++
 .../native/wgc-capture/src/mf_encoder.cpp     | 317 ++++++++++
 electron/native/wgc-capture/src/mf_encoder.h  |  63 ++
 .../native/wgc-capture/src/monitor_utils.cpp  |  88 +++
 .../native/wgc-capture/src/monitor_utils.h    |  14 +
 .../src/wasapi_loopback_capture.cpp           | 205 +++++++
 .../wgc-capture/src/wasapi_loopback_capture.h |  47 ++
 .../native/wgc-capture/src/wgc_session.cpp    | 223 +++++++
 electron/native/wgc-capture/src/wgc_session.h |  55 ++
 electron/preload.ts                           |  10 +
 package.json                                  |  13 +-
 scripts/build-windows-wgc-helper.mjs          | 112 ++++
 scripts/test-windows-wgc-helper.mjs           | 167 ++++++
 src/components/video-editor/VideoPlayback.tsx |   1 -
 src/hooks/useScreenRecorder.ts                | 167 +++++-
 src/lib/cursor/nativeCursor.ts                |  18 +-
 src/lib/exporter/audioEncoder.ts              |  28 +-
 src/lib/exporter/muxer.ts                     |   2 +-
 src/lib/nativeWindowsRecording.ts             |  41 ++
 27 files changed, 2873 insertions(+), 139 deletions(-)
 create mode 100644 docs/engineering/windows-native-recorder-roadmap.md
 create mode 100644 electron/native/README.md
 create mode 100644 electron/native/wgc-capture/CMakeLists.txt
 create mode 100644 electron/native/wgc-capture/src/main.cpp
 create mode 100644 electron/native/wgc-capture/src/mf_encoder.cpp
 create mode 100644 electron/native/wgc-capture/src/mf_encoder.h
 create mode 100644 electron/native/wgc-capture/src/monitor_utils.cpp
 create mode 100644 electron/native/wgc-capture/src/monitor_utils.h
 create mode 100644 electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
 create mode 100644 electron/native/wgc-capture/src/wasapi_loopback_capture.h
 create mode 100644 electron/native/wgc-capture/src/wgc_session.cpp
 create mode 100644 electron/native/wgc-capture/src/wgc_session.h
 create mode 100644 scripts/build-windows-wgc-helper.mjs
 create mode 100644 scripts/test-windows-wgc-helper.mjs
 create mode 100644 src/lib/nativeWindowsRecording.ts

diff --git a/.gitignore b/.gitignore
index 494da3066..84a5a1cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,52 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-electron
-dist-ssr
-*.local
-.env
-
-# Editor directories and files
-.vscode/*
-.zed/
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-release/**
-*.kiro/
-.claude/
-# npx electron-builder --mac --win
-
-# Playwright
-test-results
-playwright-report/
-
-# Vitest browser mode screenshots
-__screenshots__/
-
-# shell files
-/shell.sh
-# Nix
-result
-result-*
-.direnv/
-
-#kilocode
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-electron
+dist-ssr
+*.local
+.env
+
+# Native helper build outputs
+/electron/native/wgc-capture/build/
+/electron/native/bin/
+
+# Editor directories and files
+.vscode/*
+.zed/
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+release/**
+*.kiro/
+.claude/
+# npx electron-builder --mac --win
+
+# Playwright
+test-results
+playwright-report/
+
+# Vitest browser mode screenshots
+__screenshots__/
+
+# shell files
+/shell.sh
+# Nix
+result
+result-*
+.direnv/
+
+#kilocode
 .kilo/
\ No newline at end of file
diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
new file mode 100644
index 000000000..c6a0a063c
--- /dev/null
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -0,0 +1,202 @@
+# Windows Native Recorder Roadmap
+
+OpenScreen's Windows recorder should be owned by one native backend. Electron capture can remain available for non-Windows platforms and temporary developer diagnostics, but Windows production recording should not silently fall back to `getDisplayMedia` / `MediaRecorder`.
+
+## Goals
+
+- Capture displays and windows through Windows Graphics Capture (WGC).
+- Render the native Windows cursor as OpenScreen's high-quality scalable cursor overlay.
+- Capture system audio through WASAPI loopback.
+- Capture microphone audio through WASAPI.
+- Mix system audio and microphone audio into the primary screen recording.
+- Capture webcam video natively and keep it as a separate editable OpenScreen media stream.
+- Keep preview/export aligned because screen video, audio, webcam, and cursor share one native timing origin.
+- Keep exported MP4s Windows-friendly: H.264 video plus AAC audio. Opus-in-MP4 is not an acceptable Windows export target.
+- Package the native helper with the Windows app.
+
+## Non-Goals
+
+- Replacing the editor/export pipeline.
+- Flattening webcam into the screen recording. The editor currently treats webcam as editable picture-in-picture media, so the native recorder should preserve a separate `webcamVideoPath`.
+- Adding a native fallback for macOS or Linux in this branch.
+
+## Target Architecture
+
+The renderer keeps the existing recording controls. On Windows, `useScreenRecorder` sends a complete recording request to Electron and does not assemble Windows `MediaStream` tracks with `MediaRecorder`.
+
+Electron owns the native recording session:
+
+- resolves the selected source;
+- resolves output paths;
+- starts cursor sampling;
+- starts the helper process;
+- sends pause/resume/stop/cancel commands;
+- writes `RecordingSession` manifests;
+- reports explicit errors when a Windows-native capability is unavailable.
+
+The helper owns Windows media capture:
+
+- WGC screen/window frames;
+- WASAPI system loopback;
+- WASAPI microphone input;
+- Media Foundation webcam capture;
+- Media Foundation encoding/muxing;
+- stream timestamp normalization.
+
+## Helper Contract V2
+
+The helper receives a single JSON argument:
+
+```json
+{
+  "schemaVersion": 2,
+  "recordingId": 1234567890,
+  "source": {
+    "type": "display",
+    "sourceId": "screen:0:0",
+    "displayId": 123,
+    "windowHandle": null,
+    "bounds": { "x": 0, "y": 0, "width": 1920, "height": 1080 }
+  },
+  "video": {
+    "fps": 60,
+    "width": 1920,
+    "height": 1080,
+    "bitrate": 18000000
+  },
+  "audio": {
+    "system": { "enabled": true },
+    "microphone": { "enabled": true, "deviceId": "default", "gain": 1.4 }
+  },
+  "webcam": {
+    "enabled": true,
+    "deviceId": "default",
+    "width": 1280,
+    "height": 720,
+    "fps": 30,
+    "bitrate": 18000000
+  },
+  "outputs": {
+    "screenPath": "C:\\Users\\me\\recording-123.mp4",
+    "webcamPath": "C:\\Users\\me\\recording-123-webcam.mp4",
+    "manifestPath": "C:\\Users\\me\\recording-123.session.json"
+  }
+}
+```
+
+The helper emits newline-delimited JSON events to stdout:
+
+```json
+{ "event": "ready", "schemaVersion": 2 }
+{ "event": "recording-started", "timestampMs": 1234567890 }
+{ "event": "warning", "code": "audio-device-unavailable", "message": "..." }
+{ "event": "recording-stopped", "screenPath": "...", "webcamPath": "..." }
+{ "event": "error", "code": "unsupported-window-source", "message": "..." }
+```
+
+During migration, Electron also accepts the current textual helper messages so existing display-only smoke tests keep working.
+
+## Implementation Phases
+
+### 1. Native Session Boundary
+
+- Add a structured Windows native recording request type.
+- Pass source kind, audio flags, microphone device, webcam flags, and output paths into the helper.
+- On Windows, do not silently fall back to Electron capture. If the helper is unavailable or a native feature is missing, show a clear error.
+- Keep Electron fallback only for non-Windows and optional developer diagnostics.
+
+Acceptance:
+
+- Display-only recording still works.
+- Enabling an unsupported native feature returns an explicit native error instead of recording through Electron.
+
+### 2. WASAPI System Audio
+
+Status: initial implementation landed. The helper captures the default render endpoint with WASAPI loopback, passes the runtime mix format into `MFEncoder`, and muxes AAC audio into the primary MP4. Long-run drift correction and explicit silence insertion remain follow-up hardening work.
+
+- Add `WasapiLoopbackCapture`.
+- Capture the default render endpoint in shared loopback mode.
+- Keep `WasapiLoopbackCapture` responsible only for device activation, packet capture, and packet timestamps.
+- Keep `MFEncoder` responsible for all Media Foundation stream definitions and muxing.
+- Feed the endpoint mix format into `MFEncoder` as the single source of truth for audio stream shape: sample rate, channel count, bits per sample, block alignment, average bytes/sec, and subtype (`PCM` or `Float`).
+- Encode the primary screen MP4 with H.264 video and AAC audio through one `IMFSinkWriter`.
+- Timestamp audio from the captured frame count in 100ns units. The first implementation uses the WASAPI packet timeline; later drift correction will add explicit silence or resampling if long recordings show measurable clock skew.
+- Treat microphone mixing as a later phase. System loopback must land first without introducing renderer-side audio code.
+
+Acceptance:
+
+- Screen MP4 has an AAC audio track when system audio is enabled.
+- A 5-minute recording has audio/video duration drift below one frame.
+
+SSOT rules for this phase:
+
+- `src/lib/nativeWindowsRecording.ts` is the renderer/main TypeScript request contract.
+- `docs/engineering/windows-native-recorder-roadmap.md` is the feature-level contract and phase checklist.
+- `WgcSession::captureWidth()/captureHeight()` is the encoded screen frame size until a dedicated native scaling stage exists.
+- `WasapiLoopbackCapture::inputFormat()` is the runtime audio format source used by `MFEncoder`.
+- No duplicated hard-coded audio format assumptions in `main.cpp`.
+
+### 3. WASAPI Microphone
+
+- Add microphone device enumeration and stable device-id mapping.
+- Capture selected/default microphone through WASAPI.
+- Apply OpenScreen's current mic gain policy.
+- Mix microphone and system audio before AAC encoding.
+
+Acceptance:
+
+- Mic-only, system-only, and mixed audio recordings produce a valid AAC track.
+- Device unplug/permission failure produces an explicit error or warning.
+
+### 4. Webcam Capture
+
+- Add Media Foundation webcam source reader.
+- Select 1280x720/30fps or nearest supported format.
+- Encode webcam to `recording-<id>-webcam.mp4`.
+- Synchronize webcam timestamps to the native session clock.
+- Store `webcamVideoPath` in the OpenScreen session manifest.
+
+Acceptance:
+
+- Editor loads the native screen recording and the native webcam recording.
+- Webcam layout controls behave the same as today.
+
+### 5. Native Window Capture
+
+- Resolve Electron `window:*` selections to an `HWND`.
+- Use WGC `CreateForWindow(HWND)`.
+- Handle window close, minimize, resize, DPI scaling, and monitor moves.
+- Return clear errors for unsupported protected windows.
+
+Acceptance:
+
+- Capturing a normal app window works with cursor/audio/mic/webcam.
+- Window resize and movement do not corrupt the recording.
+
+### 6. Runtime Controls
+
+- Add pause/resume commands to the helper.
+- Add cancel command that removes partial screen/webcam outputs.
+- Keep restart as stop-discard-start from Electron until the helper supports a native restart event.
+
+Acceptance:
+
+- Pause/resume keeps preview duration coherent.
+- Cancel leaves no stale media/session/cursor files.
+
+### 7. Test Pipeline
+
+- `npm run test:wgc-helper:win`: display-only helper smoke test.
+- `npm run test:wgc-audio:win`: validates AAC track presence and duration.
+- `npm run test:wgc-window:win`: captures a fixture window by HWND.
+- `npm run test:wgc-webcam:win`: validates webcam output when a webcam is available, otherwise skips explicitly.
+- Packaging check: confirms the helper is in `app.asar.unpacked`.
+- Export check: exported MP4s generated from native recordings keep an AAC audio track when the source has audio.
+
+## Ship Criteria
+
+- Windows display capture works with cursor, system audio, microphone, and webcam.
+- Windows window capture works with cursor, system audio, microphone, and webcam.
+- Preview and export show no cursor position drift.
+- Preview and export show no measurable audio/video/webcam drift.
+- Windows production builds do not depend on Electron capture fallback.
diff --git a/docs/testing/windows-native-cursor.md b/docs/testing/windows-native-cursor.md
index 1abe04ec6..23c57a91d 100644
--- a/docs/testing/windows-native-cursor.md
+++ b/docs/testing/windows-native-cursor.md
@@ -83,3 +83,37 @@ Together, the scripts make it quick to inspect:
 - whether the real OpenScreen preview renders the same cursor behavior as the diagnostic pipeline
 
 They are not a full substitute for an end-to-end manual recording pass. Before shipping cursor changes, also test a real capture session and export from the packaged app.
+
+## Native Windows capture backend
+
+The app now routes Windows recordings through an external WGC helper instead of Electron `getDisplayMedia`. This is meant to remove the coordinate and clock split that made the reconstructed cursor drift in the preview/export path.
+
+Current native availability rules:
+
+- Windows 10 build 19041 or newer
+- a helper executable is available
+
+The helper currently implements display video capture and system audio loopback. Window capture, microphone audio, and webcam capture are part of the native recorder roadmap and fail explicitly instead of silently falling back to Electron capture on Windows.
+
+Build OpenScreen's helper locally:
+
+```powershell
+npm run build:native:win
+```
+
+Smoke-test the helper directly:
+
+```powershell
+npm run test:wgc-helper:win
+npm run test:wgc-audio:win
+```
+
+For local diagnostics with another compatible helper, point OpenScreen at that executable:
+
+```powershell
+$env:OPENSCREEN_WGC_CAPTURE_EXE = "C:\path\to\wgc-capture.exe"
+npm run build-vite
+npm run dev
+```
+
+The helper receives one JSON config argument, emits JSON lifecycle events, prints the legacy `Recording started` marker, accepts `stop` on stdin, and prints `Recording stopped. Output path: <path>`. See `electron/native/README.md` for the exact contract and build output paths.
diff --git a/electron-builder.json5 b/electron-builder.json5
index ad6cd1853..7c7c3850a 100644
--- a/electron-builder.json5
+++ b/electron-builder.json5
@@ -4,10 +4,11 @@
   "appId": "com.siddharthvaddem.openscreen",
   "asar": true,
   // .node binaries can't be dlopen'd from inside an asar — must live unpacked.
-  "asarUnpack": [
-    "node_modules/uiohook-napi/**/*",
-    "**/*.node"
-  ],
+  "asarUnpack": [
+    "node_modules/uiohook-napi/**/*",
+    "**/*.node",
+    "electron/native/bin/**"
+  ],
   "productName": "Openscreen",
   "npmRebuild": true,
   "buildDependenciesFromSource": true,
@@ -15,10 +16,11 @@
   "directories": {
     "output": "release/${version}"
   },
-  "files": [
-    "dist",
-    "dist-electron",
-    "!*.png",
+  "files": [
+    "dist",
+    "dist-electron",
+    "electron/native/bin/**/*",
+    "!*.png",
     "!preview*.png",
     "!*.md",
     "!README.md",
diff --git a/electron/electron-env.d.ts b/electron/electron-env.d.ts
index 20fa2fe02..b637fa3d0 100644
--- a/electron/electron-env.d.ts
+++ b/electron/electron-env.d.ts
@@ -72,6 +72,24 @@ interface Window {
 			error?: string;
 		}>;
 		setRecordingState: (recording: boolean, recordingId?: number) => Promise<void>;
+		isNativeWindowsCaptureAvailable: () => Promise<{
+			success: boolean;
+			available: boolean;
+			helperPath?: string;
+			reason?: string;
+			error?: string;
+		}>;
+		startNativeWindowsRecording: (
+			request: import("../src/lib/nativeWindowsRecording").NativeWindowsRecordingRequest,
+		) => Promise<import("../src/lib/nativeWindowsRecording").NativeWindowsRecordingStartResult>;
+		stopNativeWindowsRecording: (discard?: boolean) => Promise<{
+			success: boolean;
+			path?: string;
+			session?: import("../src/lib/recordingSession").RecordingSession;
+			message?: string;
+			discarded?: boolean;
+			error?: string;
+		}>;
 		discardCursorTelemetry: (recordingId: number) => Promise<void>;
 		getCursorTelemetry: (videoPath?: string) => Promise<{
 			success: boolean;
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 125315906..19f300adc 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -1,3 +1,5 @@
+import { type ChildProcessWithoutNullStreams, spawn } from "node:child_process";
+import { constants as fsConstants } from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -12,6 +14,7 @@ import {
 	shell,
 	systemPreferences,
 } from "electron";
+import type { NativeWindowsRecordingRequest } from "../../src/lib/nativeWindowsRecording";
 import {
 	normalizeProjectMedia,
 	normalizeRecordingSession,
@@ -34,6 +37,7 @@ import { registerNativeBridgeHandlers } from "./nativeBridge";
 
 const PROJECT_FILE_EXTENSION = "openscreen";
 const SHORTCUTS_FILE = path.join(app.getPath("userData"), "shortcuts.json");
+const RECORDING_FILE_PREFIX = "recording-";
 const RECORDING_SESSION_SUFFIX = ".session.json";
 const ALLOWED_IMPORT_VIDEO_EXTENSIONS = new Set([".webm", ".mp4", ".mov", ".avi", ".mkv"]);
 
@@ -248,6 +252,12 @@ const MAX_CURSOR_SAMPLES = 60 * 60 * 30; // 1 hour @ 30Hz
 
 let cursorRecordingSession: CursorRecordingSession | null = null;
 let pendingCursorRecordingData: CursorRecordingData | null = null;
+let nativeWindowsCaptureProcess: ChildProcessWithoutNullStreams | null = null;
+let nativeWindowsCaptureOutput = "";
+let nativeWindowsCaptureTargetPath: string | null = null;
+let nativeWindowsCaptureWebcamTargetPath: string | null = null;
+let nativeWindowsCaptureRecordingId: number | null = null;
+let nativeWindowsCursorOffsetMs = 0;
 
 function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 	if (!sample || typeof sample !== "object") {
@@ -402,6 +412,215 @@ function getSelectedSourceId() {
 	return typeof selectedSource?.id === "string" ? selectedSource.id : null;
 }
 
+function getSelectedDisplay() {
+	const sourceDisplayId = Number(selectedSource?.display_id);
+	if (!Number.isFinite(sourceDisplayId)) {
+		return null;
+	}
+
+	return screen.getAllDisplays().find((display) => display.id === sourceDisplayId) ?? null;
+}
+
+function resolveUnpackedAppPath(...segments: string[]) {
+	const resolved = path.join(app.getAppPath(), ...segments);
+	if (app.isPackaged) {
+		return resolved.replace(/\.asar([/\\])/, ".asar.unpacked$1");
+	}
+
+	return resolved;
+}
+
+function getNativeWindowsCaptureHelperCandidates() {
+	const envPath = process.env.OPENSCREEN_WGC_CAPTURE_EXE?.trim();
+	const archTag = process.arch === "arm64" ? "win32-arm64" : "win32-x64";
+	return [
+		envPath,
+		resolveUnpackedAppPath(
+			"electron",
+			"native",
+			"wgc-capture",
+			"build",
+			"Release",
+			"wgc-capture.exe",
+		),
+		resolveUnpackedAppPath("electron", "native", "wgc-capture", "build", "wgc-capture.exe"),
+		resolveUnpackedAppPath("electron", "native", "bin", archTag, "wgc-capture.exe"),
+	].filter((candidate): candidate is string => Boolean(candidate));
+}
+
+async function findNativeWindowsCaptureHelperPath() {
+	if (process.platform !== "win32") {
+		return null;
+	}
+
+	for (const candidate of getNativeWindowsCaptureHelperCandidates()) {
+		try {
+			await fs.access(candidate, fsConstants.X_OK);
+			return candidate;
+		} catch {
+			// Try the next configured helper location.
+		}
+	}
+
+	return null;
+}
+
+function isWindowsGraphicsCaptureOsSupported() {
+	if (process.platform !== "win32") {
+		return false;
+	}
+
+	const [, , build] = process.getSystemVersion().split(".").map(Number);
+	return Number.isFinite(build) && build >= 19041;
+}
+
+async function startCursorRecording(recordingId?: number) {
+	if (cursorRecordingSession) {
+		pendingCursorRecordingData = await cursorRecordingSession.stop();
+		cursorRecordingSession = null;
+	}
+
+	pendingCursorRecordingData = null;
+	cursorRecordingSession = createCursorRecordingSession({
+		getDisplayBounds: getSelectedSourceBounds,
+		maxSamples: MAX_CURSOR_SAMPLES,
+		platform: process.platform,
+		sampleIntervalMs: CURSOR_SAMPLE_INTERVAL_MS,
+		sourceId: getSelectedSourceId(),
+		startTimeMs:
+			typeof recordingId === "number" && Number.isFinite(recordingId) ? recordingId : undefined,
+	});
+
+	try {
+		await cursorRecordingSession.start();
+	} catch (error) {
+		console.error("Failed to start cursor recording session:", error);
+		cursorRecordingSession = null;
+	}
+}
+
+async function stopCursorRecording() {
+	if (!cursorRecordingSession) {
+		return;
+	}
+
+	try {
+		pendingCursorRecordingData = await cursorRecordingSession.stop();
+	} catch (error) {
+		console.error("Failed to stop cursor recording session:", error);
+		pendingCursorRecordingData = null;
+	} finally {
+		cursorRecordingSession = null;
+	}
+}
+
+async function writePendingCursorTelemetry(videoPath: string) {
+	const telemetryPath = `${videoPath}.cursor.json`;
+	if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
+		await fs.writeFile(telemetryPath, JSON.stringify(pendingCursorRecordingData, null, 2), "utf-8");
+	}
+	pendingCursorRecordingData = null;
+}
+
+function shiftPendingCursorTelemetry(offsetMs: number) {
+	if (!pendingCursorRecordingData || !Number.isFinite(offsetMs) || offsetMs <= 0) {
+		return;
+	}
+
+	pendingCursorRecordingData = {
+		...pendingCursorRecordingData,
+		samples: pendingCursorRecordingData.samples
+			.map((sample) => ({
+				...sample,
+				timeMs: Math.max(0, sample.timeMs - offsetMs),
+			}))
+			.sort((a, b) => a.timeMs - b.timeMs),
+	};
+}
+
+function waitForNativeWindowsCaptureStart(proc: ChildProcessWithoutNullStreams) {
+	return new Promise<void>((resolve, reject) => {
+		const timer = setTimeout(() => {
+			cleanup();
+			reject(new Error("Timed out waiting for native Windows capture to start"));
+		}, 12000);
+
+		const onOutput = (chunk: Buffer) => {
+			nativeWindowsCaptureOutput += chunk.toString();
+			if (nativeWindowsCaptureOutput.includes("Recording started")) {
+				cleanup();
+				resolve();
+			}
+		};
+		const onError = (error: Error) => {
+			cleanup();
+			reject(error);
+		};
+		const onExit = (code: number | null) => {
+			cleanup();
+			reject(
+				new Error(
+					nativeWindowsCaptureOutput.trim() ||
+						`Native Windows capture exited before recording started (code=${code ?? "unknown"})`,
+				),
+			);
+		};
+		const cleanup = () => {
+			clearTimeout(timer);
+			proc.stdout.off("data", onOutput);
+			proc.stderr.off("data", onOutput);
+			proc.off("error", onError);
+			proc.off("exit", onExit);
+		};
+
+		proc.stdout.on("data", onOutput);
+		proc.stderr.on("data", onOutput);
+		proc.once("error", onError);
+		proc.once("exit", onExit);
+	});
+}
+
+function waitForNativeWindowsCaptureStop(proc: ChildProcessWithoutNullStreams) {
+	return new Promise<string>((resolve, reject) => {
+		const onOutput = (chunk: Buffer) => {
+			nativeWindowsCaptureOutput += chunk.toString();
+		};
+		const onClose = (code: number | null) => {
+			cleanup();
+			const match = nativeWindowsCaptureOutput.match(/Recording stopped\. Output path: (.+)/);
+			if (match?.[1]) {
+				resolve(match[1].trim());
+				return;
+			}
+			if (code === 0 && nativeWindowsCaptureTargetPath) {
+				resolve(nativeWindowsCaptureTargetPath);
+				return;
+			}
+			reject(
+				new Error(
+					nativeWindowsCaptureOutput.trim() ||
+						`Native Windows capture exited with code=${code ?? "unknown"}`,
+				),
+			);
+		};
+		const onError = (error: Error) => {
+			cleanup();
+			reject(error);
+		};
+		const cleanup = () => {
+			proc.stdout.off("data", onOutput);
+			proc.stderr.off("data", onOutput);
+			proc.off("close", onClose);
+			proc.off("error", onError);
+		};
+
+		proc.stdout.on("data", onOutput);
+		proc.stderr.on("data", onOutput);
+		proc.once("close", onClose);
+		proc.once("error", onError);
+	});
+}
+
 function setCurrentRecordingSessionState(session: RecordingSession | null) {
 	currentRecordingSession = session;
 	currentVideoPath = session?.screenVideoPath ?? null;
@@ -410,10 +629,10 @@ function setCurrentRecordingSessionState(session: RecordingSession | null) {
 export function registerIpcHandlers(
 	createEditorWindow: () => void,
 	createSourceSelectorWindow: () => BrowserWindow,
-	_createCountdownOverlayWindow: () => BrowserWindow,
+	createCountdownOverlayWindow: () => BrowserWindow,
 	getMainWindow: () => BrowserWindow | null,
 	getSourceSelectorWindow: () => BrowserWindow | null,
-	_getCountdownOverlayWindow?: () => BrowserWindow | null,
+	getCountdownOverlayWindow?: () => BrowserWindow | null,
 	onRecordingStateChange?: (recording: boolean, sourceName: string) => void,
 	_switchToHud?: () => void,
 ) {
@@ -509,6 +728,282 @@ export function registerIpcHandlers(
 		createEditorWindow();
 	});
 
+	ipcMain.handle("countdown-overlay-show", async (_, value: number, runId: number) => {
+		const overlayWindow = getCountdownOverlayWindow?.() ?? createCountdownOverlayWindow();
+		if (overlayWindow.isDestroyed()) {
+			return;
+		}
+
+		if (!overlayWindow.isVisible()) {
+			overlayWindow.showInactive();
+		}
+
+		if (overlayWindow.webContents.isLoading()) {
+			await new Promise<void>((resolve) => {
+				overlayWindow.webContents.once("did-finish-load", () => resolve());
+			});
+		}
+
+		overlayWindow.webContents.send("countdown-overlay-value", value, runId);
+	});
+
+	ipcMain.handle("countdown-overlay-set-value", (_, value: number, runId: number) => {
+		const overlayWindow = getCountdownOverlayWindow?.();
+		if (!overlayWindow || overlayWindow.isDestroyed()) {
+			return;
+		}
+
+		overlayWindow.webContents.send("countdown-overlay-value", value, runId);
+	});
+
+	ipcMain.handle("countdown-overlay-hide", (_, runId: number) => {
+		const overlayWindow = getCountdownOverlayWindow?.();
+		if (!overlayWindow || overlayWindow.isDestroyed()) {
+			return;
+		}
+
+		overlayWindow.webContents.send("countdown-overlay-value", null, runId);
+		overlayWindow.hide();
+	});
+
+	ipcMain.handle("is-native-windows-capture-available", async () => {
+		if (!isWindowsGraphicsCaptureOsSupported()) {
+			return { success: true, available: false, reason: "unsupported-os" };
+		}
+
+		const helperPath = await findNativeWindowsCaptureHelperPath();
+		return helperPath
+			? { success: true, available: true, helperPath }
+			: { success: true, available: false, reason: "missing-helper" };
+	});
+
+	ipcMain.handle(
+		"start-native-windows-recording",
+		async (_, request: NativeWindowsRecordingRequest) => {
+			try {
+				if (!isWindowsGraphicsCaptureOsSupported()) {
+					return {
+						success: false,
+						error: "Windows Graphics Capture requires Windows 10 build 19041 or newer.",
+					};
+				}
+				if (nativeWindowsCaptureProcess) {
+					return { success: false, error: "Native Windows capture is already running." };
+				}
+
+				const helperPath = await findNativeWindowsCaptureHelperPath();
+				if (!helperPath) {
+					return { success: false, error: "Native Windows capture helper is not available." };
+				}
+
+				if (!request?.source?.sourceId) {
+					return {
+						success: false,
+						error: "Native Windows capture request is missing a source.",
+					};
+				}
+
+				const recordingId =
+					typeof request.recordingId === "number" && Number.isFinite(request.recordingId)
+						? request.recordingId
+						: Date.now();
+				const outputPath = path.join(RECORDINGS_DIR, `${RECORDING_FILE_PREFIX}${recordingId}.mp4`);
+				const webcamOutputPath = path.join(
+					RECORDINGS_DIR,
+					`${RECORDING_FILE_PREFIX}${recordingId}-webcam.mp4`,
+				);
+				const sourceDisplay =
+					request.source.type === "display" && typeof request.source.displayId === "number"
+						? (screen.getAllDisplays().find((display) => display.id === request.source.displayId) ??
+							null)
+						: getSelectedDisplay();
+				const bounds = sourceDisplay?.bounds ?? getSelectedSourceBounds();
+				const displayId =
+					typeof request.source.displayId === "number" && Number.isFinite(request.source.displayId)
+						? request.source.displayId
+						: Number(selectedSource?.display_id);
+				const config = {
+					schemaVersion: 2,
+					recordingId,
+					outputPath,
+					sourceType: request.source.type,
+					sourceId: request.source.sourceId,
+					displayId: Number.isFinite(displayId) ? displayId : 0,
+					windowHandle: request.source.windowHandle ?? null,
+					fps: request.video.fps,
+					videoWidth: request.video.width,
+					videoHeight: request.video.height,
+					displayX: bounds.x,
+					displayY: bounds.y,
+					displayW: bounds.width,
+					displayH: bounds.height,
+					hasDisplayBounds: true,
+					captureSystemAudio: request.audio.system.enabled,
+					captureMic: request.audio.microphone.enabled,
+					microphoneDeviceId: request.audio.microphone.deviceId ?? null,
+					microphoneGain: request.audio.microphone.gain,
+					webcamEnabled: request.webcam.enabled,
+					webcamDeviceId: request.webcam.deviceId ?? null,
+					webcamWidth: request.webcam.width,
+					webcamHeight: request.webcam.height,
+					webcamFps: request.webcam.fps,
+					outputs: {
+						screenPath: outputPath,
+						webcamPath: webcamOutputPath,
+					},
+					source: {
+						type: request.source.type,
+						sourceId: request.source.sourceId,
+						displayId: Number.isFinite(displayId) ? displayId : null,
+						windowHandle: request.source.windowHandle ?? null,
+						bounds,
+					},
+					video: request.video,
+					audio: request.audio,
+					webcam: request.webcam,
+				};
+
+				console.info("[native-wgc] starting Windows capture", {
+					helperPath,
+					source: request.source,
+					audio: request.audio,
+					webcam: request.webcam,
+					bounds,
+					sourceId: selectedSource?.id ?? null,
+					usedDisplayMatch: Boolean(sourceDisplay),
+					outputPath,
+				});
+
+				await fs.mkdir(RECORDINGS_DIR, { recursive: true });
+				nativeWindowsCaptureOutput = "";
+				nativeWindowsCaptureTargetPath = outputPath;
+				nativeWindowsCaptureWebcamTargetPath = request.webcam.enabled ? webcamOutputPath : null;
+				nativeWindowsCaptureRecordingId = recordingId;
+				nativeWindowsCursorOffsetMs = 0;
+
+				const cursorStartTimeMs = Date.now();
+				await startCursorRecording(cursorStartTimeMs);
+				console.info("[native-wgc] cursor sampler ready", {
+					cursorStartTimeMs,
+					warmupMs: Date.now() - cursorStartTimeMs,
+				});
+
+				const proc = spawn(helperPath, [JSON.stringify(config)], {
+					cwd: RECORDINGS_DIR,
+					stdio: ["pipe", "pipe", "pipe"],
+					windowsHide: true,
+				});
+				nativeWindowsCaptureProcess = proc;
+
+				await waitForNativeWindowsCaptureStart(proc);
+				const captureStartedAtMs = Date.now();
+				nativeWindowsCursorOffsetMs = Math.max(0, captureStartedAtMs - cursorStartTimeMs);
+				console.info("[native-wgc] capture started", {
+					captureStartedAtMs,
+					cursorOffsetMs: nativeWindowsCursorOffsetMs,
+				});
+
+				const source = selectedSource || { name: "Screen" };
+				if (onRecordingStateChange) {
+					onRecordingStateChange(true, source.name);
+				}
+
+				return {
+					success: true,
+					recordingId,
+					path: outputPath,
+					helperPath,
+				};
+			} catch (error) {
+				console.error("Failed to start native Windows recording:", error);
+				nativeWindowsCaptureProcess?.kill();
+				nativeWindowsCaptureProcess = null;
+				nativeWindowsCaptureTargetPath = null;
+				nativeWindowsCaptureWebcamTargetPath = null;
+				nativeWindowsCaptureRecordingId = null;
+				nativeWindowsCursorOffsetMs = 0;
+				await stopCursorRecording();
+				return { success: false, error: String(error) };
+			}
+		},
+	);
+
+	ipcMain.handle("stop-native-windows-recording", async (_, discard?: boolean) => {
+		const proc = nativeWindowsCaptureProcess;
+		const preferredPath = nativeWindowsCaptureTargetPath;
+		const preferredWebcamPath = nativeWindowsCaptureWebcamTargetPath;
+		const recordingId = nativeWindowsCaptureRecordingId ?? Date.now();
+
+		if (!proc) {
+			return { success: false, error: "Native Windows capture is not running." };
+		}
+
+		try {
+			const stoppedPathPromise = waitForNativeWindowsCaptureStop(proc);
+			proc.stdin.write("stop\n");
+			const stoppedPath = await stoppedPathPromise;
+			const screenVideoPath = stoppedPath || preferredPath;
+			if (!screenVideoPath) {
+				throw new Error("Native Windows capture did not return an output path.");
+			}
+
+			await stopCursorRecording();
+			if (discard) {
+				pendingCursorRecordingData = null;
+				await Promise.all([
+					fs.rm(screenVideoPath, { force: true }),
+					preferredWebcamPath ? fs.rm(preferredWebcamPath, { force: true }) : Promise.resolve(),
+					fs.rm(`${screenVideoPath}.cursor.json`, { force: true }),
+				]);
+				return { success: true, discarded: true };
+			}
+
+			shiftPendingCursorTelemetry(nativeWindowsCursorOffsetMs);
+			await writePendingCursorTelemetry(screenVideoPath);
+			let webcamVideoPath: string | undefined;
+			if (preferredWebcamPath) {
+				try {
+					await fs.access(preferredWebcamPath, fsConstants.R_OK);
+					webcamVideoPath = preferredWebcamPath;
+				} catch {
+					webcamVideoPath = undefined;
+				}
+			}
+			const session: RecordingSession = webcamVideoPath
+				? { screenVideoPath, webcamVideoPath, createdAt: recordingId }
+				: { screenVideoPath, createdAt: recordingId };
+			setCurrentRecordingSessionState(session);
+			currentProjectPath = null;
+
+			const sessionManifestPath = path.join(
+				RECORDINGS_DIR,
+				`${path.parse(screenVideoPath).name}${RECORDING_SESSION_SUFFIX}`,
+			);
+			await fs.writeFile(sessionManifestPath, JSON.stringify(session, null, 2), "utf-8");
+
+			return {
+				success: true,
+				path: screenVideoPath,
+				session,
+				message: "Native Windows recording session stored successfully",
+			};
+		} catch (error) {
+			console.error("Failed to stop native Windows recording:", error);
+			await stopCursorRecording();
+			return { success: false, error: String(error) };
+		} finally {
+			nativeWindowsCaptureProcess = null;
+			nativeWindowsCaptureTargetPath = null;
+			nativeWindowsCaptureWebcamTargetPath = null;
+			nativeWindowsCaptureRecordingId = null;
+			nativeWindowsCursorOffsetMs = 0;
+			const source = selectedSource || { name: "Screen" };
+			if (onRecordingStateChange) {
+				onRecordingStateChange(false, source.name);
+			}
+		}
+	});
+
 	ipcMain.handle("store-recorded-session", async (_, payload: StoreRecordedSessionInput) => {
 		try {
 			return await storeRecordedSessionFiles(payload);
@@ -542,15 +1037,7 @@ export function registerIpcHandlers(
 		setCurrentRecordingSessionState(session);
 		currentProjectPath = null;
 
-		const telemetryPath = `${screenVideoPath}.cursor.json`;
-		if (pendingCursorRecordingData && pendingCursorRecordingData.samples.length > 0) {
-			await fs.writeFile(
-				telemetryPath,
-				JSON.stringify(pendingCursorRecordingData, null, 2),
-				"utf-8",
-			);
-		}
-		pendingCursorRecordingData = null;
+		await writePendingCursorTelemetry(screenVideoPath);
 
 		const sessionManifestPath = path.join(
 			RECORDINGS_DIR,
@@ -609,39 +1096,9 @@ export function registerIpcHandlers(
 
 	ipcMain.handle("set-recording-state", async (_, recording: boolean, recordingId?: number) => {
 		if (recording) {
-			if (cursorRecordingSession) {
-				pendingCursorRecordingData = await cursorRecordingSession.stop();
-				cursorRecordingSession = null;
-			}
-
-			pendingCursorRecordingData = null;
-			cursorRecordingSession = createCursorRecordingSession({
-				getDisplayBounds: getSelectedSourceBounds,
-				maxSamples: MAX_CURSOR_SAMPLES,
-				platform: process.platform,
-				sampleIntervalMs: CURSOR_SAMPLE_INTERVAL_MS,
-				sourceId: getSelectedSourceId(),
-				startTimeMs:
-					typeof recordingId === "number" && Number.isFinite(recordingId) ? recordingId : undefined,
-			});
-
-			try {
-				await cursorRecordingSession.start();
-			} catch (error) {
-				console.error("Failed to start cursor recording session:", error);
-				cursorRecordingSession = null;
-			}
+			await startCursorRecording(recordingId);
 		} else {
-			if (cursorRecordingSession) {
-				try {
-					pendingCursorRecordingData = await cursorRecordingSession.stop();
-				} catch (error) {
-					console.error("Failed to stop cursor recording session:", error);
-					pendingCursorRecordingData = null;
-				} finally {
-					cursorRecordingSession = null;
-				}
-			}
+			await stopCursorRecording();
 		}
 
 		const source = selectedSource || { name: "Screen" };
diff --git a/electron/native/README.md b/electron/native/README.md
new file mode 100644
index 000000000..512517bc4
--- /dev/null
+++ b/electron/native/README.md
@@ -0,0 +1,50 @@
+# Native capture helpers
+
+Windows native recording is resolved from one of these locations:
+
+1. `OPENSCREEN_WGC_CAPTURE_EXE`, for local development and diagnostics.
+2. `electron/native/wgc-capture/build/wgc-capture.exe`, for a locally built Ninja helper.
+3. `electron/native/wgc-capture/build/Release/wgc-capture.exe`, for a locally built multi-config helper.
+4. `electron/native/bin/win32-x64/wgc-capture.exe` or `electron/native/bin/win32-arm64/wgc-capture.exe`, for packaged prebuilt helpers.
+
+Build the Windows helper with:
+
+```powershell
+npm run build:native:win
+```
+
+The build writes the CMake output to `electron/native/wgc-capture/build/wgc-capture.exe` and copies the redistributable binary to `electron/native/bin/win32-x64/wgc-capture.exe`.
+
+The helper contract is process-based: the app starts the process with one JSON argument and sends commands on stdin. `stop\n` finalizes the recording. During migration the helper prints both newline-delimited JSON events and the legacy text messages `Recording started` / `Recording stopped. Output path: <path>`.
+
+Current V2 JSON shape:
+
+```json
+{
+  "schemaVersion": 2,
+  "recordingId": 123,
+  "sourceType": "display",
+  "sourceId": "screen:0:0",
+  "displayId": 1,
+  "outputPath": "C:\\path\\recording-123.mp4",
+  "videoWidth": 1920,
+  "videoHeight": 1080,
+  "fps": 60,
+  "captureSystemAudio": false,
+  "captureMic": false,
+  "webcamEnabled": false,
+  "outputs": {
+    "screenPath": "C:\\path\\recording-123.mp4",
+    "webcamPath": "C:\\path\\recording-123-webcam.mp4"
+  }
+}
+```
+
+The current helper implementation supports display video capture and system audio loopback. Microphone, webcam, and window capture now fail explicitly in the helper rather than silently falling back to Electron capture on Windows. See `docs/engineering/windows-native-recorder-roadmap.md` for the phased implementation plan.
+
+Smoke-test the helper with:
+
+```powershell
+npm run test:wgc-helper:win
+npm run test:wgc-audio:win
+```
diff --git a/electron/native/wgc-capture/CMakeLists.txt b/electron/native/wgc-capture/CMakeLists.txt
new file mode 100644
index 000000000..76999f707
--- /dev/null
+++ b/electron/native/wgc-capture/CMakeLists.txt
@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.20)
+
+# The local Windows SDK image used by some contributors can miss gdi32.lib,
+# while CMake's default MSVC console template links it unconditionally. This
+# helper does not use GDI, so keep the standard library set minimal and explicit.
+set(CMAKE_CXX_STANDARD_LIBRARIES
+  "kernel32.lib user32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib"
+  CACHE STRING "" FORCE)
+
+project(openscreen-wgc-capture LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_executable(wgc-capture
+  src/main.cpp
+  src/mf_encoder.cpp
+  src/mf_encoder.h
+  src/monitor_utils.cpp
+  src/monitor_utils.h
+  src/wasapi_loopback_capture.cpp
+  src/wasapi_loopback_capture.h
+  src/wgc_session.cpp
+  src/wgc_session.h
+)
+
+target_compile_definitions(wgc-capture PRIVATE
+  NOMINMAX
+  WIN32_LEAN_AND_MEAN
+  _WIN32_WINNT=0x0A00
+)
+
+target_compile_options(wgc-capture PRIVATE /EHsc /W4 /utf-8)
+
+target_link_libraries(wgc-capture PRIVATE
+  d3d11
+  dxgi
+  mf
+  mfplat
+  mfreadwrite
+  mfuuid
+  runtimeobject
+  windowsapp
+)
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
new file mode 100644
index 000000000..39d5c62e1
--- /dev/null
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -0,0 +1,433 @@
+#include "mf_encoder.h"
+#include "monitor_utils.h"
+#include "wasapi_loopback_capture.h"
+#include "wgc_session.h"
+
+#include <winrt/Windows.Foundation.h>
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <cctype>
+#include <cstdint>
+#include <iostream>
+#include <mutex>
+#include <string>
+#include <thread>
+
+namespace {
+
+struct CaptureConfig {
+    int schemaVersion = 1;
+    int64_t displayId = 0;
+    int64_t recordingId = 0;
+    std::string sourceType = "display";
+    std::string sourceId;
+    std::string windowHandle;
+    std::string outputPath;
+    int fps = 60;
+    int width = 0;
+    int height = 0;
+    MonitorBounds bounds{};
+    bool hasDisplayBounds = false;
+    bool captureSystemAudio = false;
+    bool captureMic = false;
+    bool webcamEnabled = false;
+    std::string microphoneDeviceId;
+    double microphoneGain = 1.0;
+    std::string webcamDeviceId;
+    int webcamWidth = 0;
+    int webcamHeight = 0;
+    int webcamFps = 0;
+};
+
+std::wstring utf8ToWide(const std::string& value) {
+    if (value.empty()) {
+        return {};
+    }
+
+    const int size = MultiByteToWideChar(CP_UTF8, 0, value.data(), static_cast<int>(value.size()), nullptr, 0);
+    std::wstring result(static_cast<size_t>(size), L'\0');
+    MultiByteToWideChar(CP_UTF8, 0, value.data(), static_cast<int>(value.size()), result.data(), size);
+    return result;
+}
+
+std::string jsonEscape(const std::string& value) {
+    std::string result;
+    result.reserve(value.size());
+    for (const char c : value) {
+        switch (c) {
+            case '\\':
+                result += "\\\\";
+                break;
+            case '"':
+                result += "\\\"";
+                break;
+            case '\n':
+                result += "\\n";
+                break;
+            case '\r':
+                result += "\\r";
+                break;
+            case '\t':
+                result += "\\t";
+                break;
+            default:
+                result.push_back(c);
+                break;
+        }
+    }
+    return result;
+}
+
+bool findBool(const std::string& json, const std::string& key, bool fallback) {
+    auto pos = json.find("\"" + key + "\"");
+    if (pos == std::string::npos) {
+        return fallback;
+    }
+    pos = json.find(':', pos);
+    if (pos == std::string::npos) {
+        return fallback;
+    }
+    pos += 1;
+    while (pos < json.size() && std::isspace(static_cast<unsigned char>(json[pos]))) {
+        pos += 1;
+    }
+    if (json.compare(pos, 4, "true") == 0) {
+        return true;
+    }
+    if (json.compare(pos, 5, "false") == 0) {
+        return false;
+    }
+    return fallback;
+}
+
+int64_t findInt64(const std::string& json, const std::string& key, int64_t fallback) {
+    auto pos = json.find("\"" + key + "\"");
+    if (pos == std::string::npos) {
+        return fallback;
+    }
+    pos = json.find(':', pos);
+    if (pos == std::string::npos) {
+        return fallback;
+    }
+    pos += 1;
+    while (pos < json.size() && std::isspace(static_cast<unsigned char>(json[pos]))) {
+        pos += 1;
+    }
+    try {
+        return std::stoll(json.substr(pos));
+    } catch (...) {
+        return fallback;
+    }
+}
+
+int findInt(const std::string& json, const std::string& key, int fallback) {
+    return static_cast<int>(findInt64(json, key, fallback));
+}
+
+double findDouble(const std::string& json, const std::string& key, double fallback) {
+    auto pos = json.find("\"" + key + "\"");
+    if (pos == std::string::npos) {
+        return fallback;
+    }
+    pos = json.find(':', pos);
+    if (pos == std::string::npos) {
+        return fallback;
+    }
+    pos += 1;
+    while (pos < json.size() && std::isspace(static_cast<unsigned char>(json[pos]))) {
+        pos += 1;
+    }
+    try {
+        return std::stod(json.substr(pos));
+    } catch (...) {
+        return fallback;
+    }
+}
+
+std::string findString(const std::string& json, const std::string& key) {
+    auto pos = json.find("\"" + key + "\"");
+    if (pos == std::string::npos) {
+        return {};
+    }
+    pos = json.find(':', pos);
+    if (pos == std::string::npos) {
+        return {};
+    }
+    pos += 1;
+    while (pos < json.size() && std::isspace(static_cast<unsigned char>(json[pos]))) {
+        pos += 1;
+    }
+    if (pos >= json.size() || json[pos] != '"') {
+        return {};
+    }
+    pos += 1;
+
+    std::string result;
+    while (pos < json.size()) {
+        const char c = json[pos++];
+        if (c == '"') {
+            break;
+        }
+        if (c == '\\' && pos < json.size()) {
+            const char escaped = json[pos++];
+            switch (escaped) {
+                case '\\':
+                case '"':
+                case '/':
+                    result.push_back(escaped);
+                    break;
+                case 'n':
+                    result.push_back('\n');
+                    break;
+                case 'r':
+                    result.push_back('\r');
+                    break;
+                case 't':
+                    result.push_back('\t');
+                    break;
+                default:
+                    result.push_back(escaped);
+                    break;
+            }
+            continue;
+        }
+        result.push_back(c);
+    }
+    return result;
+}
+
+bool parseConfig(const std::string& json, CaptureConfig& config) {
+    config.schemaVersion = findInt(json, "schemaVersion", 1);
+    config.outputPath = findString(json, "screenPath");
+    if (config.outputPath.empty()) {
+        config.outputPath = findString(json, "outputPath");
+    }
+    if (config.outputPath.empty()) {
+        return false;
+    }
+
+    config.recordingId = findInt64(json, "recordingId", 0);
+    config.sourceType = findString(json, "sourceType");
+    if (config.sourceType.empty()) {
+        config.sourceType = "display";
+    }
+    config.sourceId = findString(json, "sourceId");
+    config.windowHandle = findString(json, "windowHandle");
+    config.displayId = findInt64(json, "displayId", 0);
+    config.fps = std::clamp(findInt(json, "fps", 60), 1, 120);
+    config.width = findInt(json, "videoWidth", findInt(json, "width", 0));
+    config.height = findInt(json, "videoHeight", findInt(json, "height", 0));
+    config.bounds.x = findInt(json, "displayX", 0);
+    config.bounds.y = findInt(json, "displayY", 0);
+    config.bounds.width = findInt(json, "displayW", 0);
+    config.bounds.height = findInt(json, "displayH", 0);
+    config.hasDisplayBounds = findBool(json, "hasDisplayBounds", false);
+    config.captureSystemAudio = findBool(json, "captureSystemAudio", false);
+    config.captureMic = findBool(json, "captureMic", false);
+    config.webcamEnabled = findBool(json, "webcamEnabled", false);
+    config.microphoneDeviceId = findString(json, "microphoneDeviceId");
+    config.microphoneGain = findDouble(json, "microphoneGain", 1.0);
+    config.webcamDeviceId = findString(json, "webcamDeviceId");
+    config.webcamWidth = findInt(json, "webcamWidth", 0);
+    config.webcamHeight = findInt(json, "webcamHeight", 0);
+    config.webcamFps = findInt(json, "webcamFps", 0);
+    return true;
+}
+
+void readStopCommands(std::atomic<bool>& stopRequested, std::condition_variable& cv) {
+    std::string line;
+    while (std::getline(std::cin, line)) {
+        if (line == "stop" || line == "q" || line == "quit") {
+            stopRequested = true;
+            cv.notify_all();
+            return;
+        }
+    }
+    stopRequested = true;
+    cv.notify_all();
+}
+
+} // namespace
+
+int main(int argc, char* argv[]) {
+    if (argc < 2) {
+        std::cerr << "ERROR: Missing JSON config argument" << std::endl;
+        return 1;
+    }
+
+    winrt::init_apartment(winrt::apartment_type::multi_threaded);
+
+    CaptureConfig config;
+    if (!parseConfig(argv[1], config)) {
+        std::cerr << "ERROR: Failed to parse config JSON" << std::endl;
+        return 1;
+    }
+
+    std::cout << "{\"event\":\"ready\",\"schemaVersion\":2}" << std::endl;
+
+    if (config.sourceType != "display") {
+        std::cerr << "ERROR: Native window capture is not implemented yet" << std::endl;
+        return 1;
+    }
+
+    if (config.captureMic) {
+        std::cerr << "ERROR: Microphone capture is not implemented in this helper yet" << std::endl;
+        return 1;
+    }
+
+    if (config.webcamEnabled) {
+        std::cerr << "ERROR: Native webcam capture is not implemented in this helper yet" << std::endl;
+        return 1;
+    }
+
+    HMONITOR monitor = findMonitorForCapture(
+        config.displayId,
+        config.hasDisplayBounds ? &config.bounds : nullptr);
+    if (!monitor) {
+        std::cerr << "ERROR: Could not resolve monitor" << std::endl;
+        return 1;
+    }
+
+    WgcSession session;
+    if (!session.initialize(monitor, config.fps)) {
+        std::cerr << "ERROR: Failed to initialize WGC session" << std::endl;
+        return 1;
+    }
+
+    // WGC owns the captured texture size. Encoding must use that exact size
+    // until a dedicated GPU scaling pass is introduced; CopyResource requires
+    // matching resource dimensions.
+    int width = session.captureWidth();
+    int height = session.captureHeight();
+    width = (std::max(2, width) / 2) * 2;
+    height = (std::max(2, height) / 2) * 2;
+
+    const int pixels = width * height;
+    const int bitrate = pixels >= 3840 * 2160 ? 45'000'000 : pixels >= 2560 * 1440 ? 28'000'000 : 18'000'000;
+
+    WasapiLoopbackCapture loopbackCapture;
+    const AudioInputFormat* audioFormat = nullptr;
+    if (config.captureSystemAudio) {
+        if (!loopbackCapture.initialize()) {
+            std::cerr << "ERROR: Failed to initialize WASAPI loopback capture" << std::endl;
+            return 1;
+        }
+        audioFormat = &loopbackCapture.inputFormat();
+        std::cout << "{\"event\":\"audio-format\",\"schemaVersion\":2,\"sampleRate\":"
+                  << audioFormat->sampleRate << ",\"channels\":" << audioFormat->channels
+                  << ",\"bitsPerSample\":" << audioFormat->bitsPerSample << "}" << std::endl;
+    }
+
+    MFEncoder encoder;
+    if (!encoder.initialize(
+            utf8ToWide(config.outputPath),
+            width,
+            height,
+            config.fps,
+            bitrate,
+            session.device(),
+            session.context(),
+            audioFormat)) {
+        std::cerr << "ERROR: Failed to initialize Media Foundation encoder" << std::endl;
+        return 1;
+    }
+
+    std::mutex mutex;
+    std::condition_variable cv;
+    std::atomic<bool> stopRequested = false;
+    std::atomic<bool> firstFrameWritten = false;
+    std::atomic<bool> encodeFailed = false;
+
+    session.setFrameCallback([&](ID3D11Texture2D* texture, int64_t timestampHns) {
+        if (stopRequested) {
+            return;
+        }
+
+        std::scoped_lock lock(mutex);
+        if (!encoder.writeFrame(texture, timestampHns)) {
+            encodeFailed = true;
+            stopRequested = true;
+            cv.notify_all();
+            return;
+        }
+        if (!firstFrameWritten.exchange(true)) {
+            cv.notify_all();
+        }
+    });
+
+    if (config.captureSystemAudio) {
+        if (!loopbackCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
+                if (stopRequested) {
+                    return;
+                }
+
+                if (!encoder.writeAudio(data, byteCount, timestampHns, durationHns)) {
+                    encodeFailed = true;
+                    stopRequested = true;
+                    cv.notify_all();
+                }
+            })) {
+            std::cerr << "ERROR: Failed to start WASAPI loopback capture" << std::endl;
+            return 1;
+        }
+    }
+
+    if (!session.start()) {
+        loopbackCapture.stop();
+        std::cerr << "ERROR: Failed to start WGC session" << std::endl;
+        return 1;
+    }
+
+    std::thread stdinThread(readStopCommands, std::ref(stopRequested), std::ref(cv));
+
+    {
+        std::unique_lock lock(mutex);
+        const bool started = cv.wait_for(lock, std::chrono::seconds(10), [&] {
+            return firstFrameWritten.load() || stopRequested.load();
+        });
+        if (!started || !firstFrameWritten) {
+            stopRequested = true;
+            cv.notify_all();
+            if (stdinThread.joinable()) {
+                stdinThread.detach();
+            }
+            loopbackCapture.stop();
+            std::cerr << "ERROR: Timed out waiting for first WGC frame" << std::endl;
+            return 1;
+        }
+    }
+
+    std::cout << "{\"event\":\"recording-started\",\"schemaVersion\":2}" << std::endl;
+    std::cout << "Recording started" << std::endl;
+
+    {
+        std::unique_lock lock(mutex);
+        cv.wait(lock, [&] {
+            return stopRequested.load();
+        });
+    }
+
+    loopbackCapture.stop();
+    session.stop();
+    {
+        std::scoped_lock lock(mutex);
+        encoder.finalize();
+    }
+
+    if (stdinThread.joinable()) {
+        stdinThread.join();
+    }
+
+    if (encodeFailed) {
+        std::cerr << "ERROR: Failed to encode WGC frame" << std::endl;
+        return 1;
+    }
+
+    std::cout << "{\"event\":\"recording-stopped\",\"schemaVersion\":2,\"screenPath\":\""
+              << jsonEscape(config.outputPath) << "\"}" << std::endl;
+    std::cout << "Recording stopped. Output path: " << config.outputPath << std::endl;
+    return 0;
+}
diff --git a/electron/native/wgc-capture/src/mf_encoder.cpp b/electron/native/wgc-capture/src/mf_encoder.cpp
new file mode 100644
index 000000000..fc95fc23e
--- /dev/null
+++ b/electron/native/wgc-capture/src/mf_encoder.cpp
@@ -0,0 +1,317 @@
+#include "mf_encoder.h"
+
+#include <mfapi.h>
+#include <mferror.h>
+#include <propvarutil.h>
+
+#include <algorithm>
+#include <cstring>
+#include <iostream>
+
+namespace {
+
+bool succeeded(HRESULT hr, const char* label) {
+    if (SUCCEEDED(hr)) {
+        return true;
+    }
+
+    std::cerr << "ERROR: " << label << " failed (hr=0x" << std::hex << hr << std::dec << ")"
+              << std::endl;
+    return false;
+}
+
+void setFrameSize(IMFMediaType* type, UINT32 width, UINT32 height) {
+    MFSetAttributeSize(type, MF_MT_FRAME_SIZE, width, height);
+}
+
+void setFrameRate(IMFMediaType* type, UINT32 fps) {
+    MFSetAttributeRatio(type, MF_MT_FRAME_RATE, fps, 1);
+}
+
+void setPixelAspectRatio(IMFMediaType* type) {
+    MFSetAttributeRatio(type, MF_MT_PIXEL_ASPECT_RATIO, 1, 1);
+}
+
+void setAudioFormat(IMFMediaType* type, UINT32 channels, UINT32 sampleRate, UINT32 bitsPerSample) {
+    type->SetUINT32(MF_MT_AUDIO_NUM_CHANNELS, channels);
+    type->SetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, sampleRate);
+    type->SetUINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, bitsPerSample);
+}
+
+} // namespace
+
+MFEncoder::~MFEncoder() {
+    finalize();
+}
+
+bool MFEncoder::initialize(
+    const std::wstring& outputPath,
+    int width,
+    int height,
+    int fps,
+    int bitrate,
+    ID3D11Device* device,
+    ID3D11DeviceContext* context,
+    const AudioInputFormat* audioFormat) {
+    width_ = (std::max(2, width) / 2) * 2;
+    height_ = (std::max(2, height) / 2) * 2;
+    fps_ = std::max(1, fps);
+    device_ = device;
+    context_ = context;
+
+    if (!succeeded(MFStartup(MF_VERSION), "MFStartup")) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IMFMediaType> outputType;
+    if (!succeeded(MFCreateMediaType(&outputType), "MFCreateMediaType(output)")) {
+        return false;
+    }
+    outputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+    outputType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_H264);
+    outputType->SetUINT32(MF_MT_AVG_BITRATE, static_cast<UINT32>(std::max(1, bitrate)));
+    outputType->SetUINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive);
+    setFrameSize(outputType.Get(), static_cast<UINT32>(width_), static_cast<UINT32>(height_));
+    setFrameRate(outputType.Get(), static_cast<UINT32>(fps_));
+    setPixelAspectRatio(outputType.Get());
+
+    if (!succeeded(MFCreateSinkWriterFromURL(outputPath.c_str(), nullptr, nullptr, &sinkWriter_),
+                   "MFCreateSinkWriterFromURL")) {
+        return false;
+    }
+    if (!succeeded(sinkWriter_->AddStream(outputType.Get(), &videoStreamIndex_), "AddStream")) {
+        return false;
+    }
+
+    if (audioFormat && !configureAudioStream(*audioFormat)) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IMFMediaType> inputType;
+    if (!succeeded(MFCreateMediaType(&inputType), "MFCreateMediaType(input)")) {
+        return false;
+    }
+    inputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+    inputType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32);
+    inputType->SetUINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive);
+    inputType->SetUINT32(MF_MT_DEFAULT_STRIDE, static_cast<UINT32>(width_ * 4));
+    setFrameSize(inputType.Get(), static_cast<UINT32>(width_), static_cast<UINT32>(height_));
+    setFrameRate(inputType.Get(), static_cast<UINT32>(fps_));
+    setPixelAspectRatio(inputType.Get());
+
+    if (!succeeded(sinkWriter_->SetInputMediaType(videoStreamIndex_, inputType.Get(), nullptr),
+                   "SetInputMediaType")) {
+        return false;
+    }
+    if (!succeeded(sinkWriter_->BeginWriting(), "BeginWriting")) {
+        return false;
+    }
+
+    return true;
+}
+
+bool MFEncoder::configureAudioStream(const AudioInputFormat& audioFormat) {
+    if (!sinkWriter_) {
+        return false;
+    }
+    if (audioFormat.sampleRate == 0 || audioFormat.channels == 0 || audioFormat.blockAlign == 0) {
+        std::cerr << "ERROR: Invalid audio input format" << std::endl;
+        return false;
+    }
+
+    const UINT32 bitsPerSample = std::max<UINT32>(8, audioFormat.bitsPerSample);
+    const UINT32 aacBytesPerSecond = 24'000;
+
+    Microsoft::WRL::ComPtr<IMFMediaType> outputType;
+    if (!succeeded(MFCreateMediaType(&outputType), "MFCreateMediaType(audio output)")) {
+        return false;
+    }
+    outputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
+    outputType->SetGUID(MF_MT_SUBTYPE, MFAudioFormat_AAC);
+    setAudioFormat(outputType.Get(), audioFormat.channels, audioFormat.sampleRate, 16);
+    outputType->SetUINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, aacBytesPerSecond);
+    outputType->SetUINT32(MF_MT_AAC_PAYLOAD_TYPE, 0);
+
+    if (!succeeded(sinkWriter_->AddStream(outputType.Get(), &audioStreamIndex_), "AddStream(audio)")) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IMFMediaType> inputType;
+    if (!succeeded(MFCreateMediaType(&inputType), "MFCreateMediaType(audio input)")) {
+        return false;
+    }
+    inputType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
+    inputType->SetGUID(MF_MT_SUBTYPE, audioFormat.subtype);
+    setAudioFormat(inputType.Get(), audioFormat.channels, audioFormat.sampleRate, bitsPerSample);
+    inputType->SetUINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, audioFormat.blockAlign);
+    inputType->SetUINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, audioFormat.avgBytesPerSec);
+    inputType->SetUINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE);
+
+    if (!succeeded(sinkWriter_->SetInputMediaType(audioStreamIndex_, inputType.Get(), nullptr),
+                   "SetInputMediaType(audio)")) {
+        return false;
+    }
+
+    hasAudioStream_ = true;
+    return true;
+}
+
+bool MFEncoder::ensureStagingTexture(ID3D11Texture2D* texture) {
+    if (stagingTexture_) {
+        return true;
+    }
+
+    D3D11_TEXTURE2D_DESC desc{};
+    texture->GetDesc(&desc);
+    desc.Width = static_cast<UINT>(width_);
+    desc.Height = static_cast<UINT>(height_);
+    desc.MipLevels = 1;
+    desc.ArraySize = 1;
+    desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+    desc.SampleDesc.Count = 1;
+    desc.SampleDesc.Quality = 0;
+    desc.Usage = D3D11_USAGE_STAGING;
+    desc.BindFlags = 0;
+    desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+    desc.MiscFlags = 0;
+
+    return succeeded(device_->CreateTexture2D(&desc, nullptr, &stagingTexture_),
+                     "CreateTexture2D(staging)");
+}
+
+bool MFEncoder::copyFrameToBuffer(ID3D11Texture2D* texture, BYTE* destination, DWORD destinationSize) {
+    if (!ensureStagingTexture(texture)) {
+        return false;
+    }
+
+    context_->CopyResource(stagingTexture_.Get(), texture);
+
+    D3D11_MAPPED_SUBRESOURCE mapped{};
+    if (!succeeded(context_->Map(stagingTexture_.Get(), 0, D3D11_MAP_READ, 0, &mapped), "Map")) {
+        return false;
+    }
+
+    const DWORD rowBytes = static_cast<DWORD>(width_ * 4);
+    const DWORD requiredBytes = rowBytes * static_cast<DWORD>(height_);
+    if (destinationSize < requiredBytes) {
+        context_->Unmap(stagingTexture_.Get(), 0);
+        std::cerr << "ERROR: Media Foundation buffer is too small" << std::endl;
+        return false;
+    }
+
+    auto* source = static_cast<const BYTE*>(mapped.pData);
+    for (int y = 0; y < height_; y += 1) {
+        std::memcpy(destination + rowBytes * y, source + mapped.RowPitch * y, rowBytes);
+    }
+
+    context_->Unmap(stagingTexture_.Get(), 0);
+    return true;
+}
+
+bool MFEncoder::writeFrame(ID3D11Texture2D* texture, int64_t timestampHns) {
+    std::scoped_lock writerLock(writerMutex_);
+    if (!sinkWriter_ || finalized_) {
+        return false;
+    }
+
+    if (firstTimestampHns_ < 0) {
+        firstTimestampHns_ = timestampHns;
+    }
+
+    int64_t sampleTime = timestampHns - firstTimestampHns_;
+    if (sampleTime <= lastTimestampHns_) {
+        sampleTime = lastTimestampHns_ + (10'000'000LL / fps_);
+    }
+    const int64_t sampleDuration = 10'000'000LL / fps_;
+    lastTimestampHns_ = sampleTime;
+
+    Microsoft::WRL::ComPtr<IMFMediaBuffer> buffer;
+    const DWORD frameBytes = static_cast<DWORD>(width_ * height_ * 4);
+    if (!succeeded(MFCreateMemoryBuffer(frameBytes, &buffer), "MFCreateMemoryBuffer")) {
+        return false;
+    }
+
+    BYTE* data = nullptr;
+    DWORD maxLength = 0;
+    DWORD currentLength = 0;
+    if (!succeeded(buffer->Lock(&data, &maxLength, &currentLength), "IMFMediaBuffer::Lock")) {
+        return false;
+    }
+
+    const bool copied = copyFrameToBuffer(texture, data, maxLength);
+    buffer->Unlock();
+    if (!copied) {
+        return false;
+    }
+    buffer->SetCurrentLength(frameBytes);
+
+    Microsoft::WRL::ComPtr<IMFSample> sample;
+    if (!succeeded(MFCreateSample(&sample), "MFCreateSample")) {
+        return false;
+    }
+    sample->AddBuffer(buffer.Get());
+    sample->SetSampleTime(sampleTime);
+    sample->SetSampleDuration(sampleDuration);
+
+    return succeeded(sinkWriter_->WriteSample(videoStreamIndex_, sample.Get()), "WriteSample");
+}
+
+bool MFEncoder::writeAudio(const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
+    std::scoped_lock writerLock(writerMutex_);
+    if (!sinkWriter_ || finalized_ || !hasAudioStream_) {
+        return false;
+    }
+    if (!data || byteCount == 0 || durationHns <= 0) {
+        return true;
+    }
+
+    Microsoft::WRL::ComPtr<IMFMediaBuffer> buffer;
+    if (!succeeded(MFCreateMemoryBuffer(byteCount, &buffer), "MFCreateMemoryBuffer(audio)")) {
+        return false;
+    }
+
+    BYTE* destination = nullptr;
+    DWORD maxLength = 0;
+    DWORD currentLength = 0;
+    if (!succeeded(buffer->Lock(&destination, &maxLength, &currentLength),
+                   "IMFMediaBuffer::Lock(audio)")) {
+        return false;
+    }
+    if (maxLength < byteCount) {
+        buffer->Unlock();
+        std::cerr << "ERROR: Media Foundation audio buffer is too small" << std::endl;
+        return false;
+    }
+    std::memcpy(destination, data, byteCount);
+    buffer->Unlock();
+    buffer->SetCurrentLength(byteCount);
+
+    Microsoft::WRL::ComPtr<IMFSample> sample;
+    if (!succeeded(MFCreateSample(&sample), "MFCreateSample(audio)")) {
+        return false;
+    }
+    sample->AddBuffer(buffer.Get());
+    sample->SetSampleTime(std::max<int64_t>(0, timestampHns));
+    sample->SetSampleDuration(durationHns);
+
+    return succeeded(sinkWriter_->WriteSample(audioStreamIndex_, sample.Get()), "WriteSample(audio)");
+}
+
+bool MFEncoder::finalize() {
+    std::scoped_lock writerLock(writerMutex_);
+    if (finalized_) {
+        return true;
+    }
+
+    finalized_ = true;
+    bool ok = true;
+    if (sinkWriter_) {
+        ok = succeeded(sinkWriter_->Finalize(), "SinkWriter::Finalize");
+        sinkWriter_.Reset();
+    }
+    stagingTexture_.Reset();
+    context_.Reset();
+    device_.Reset();
+    MFShutdown();
+    return ok;
+}
diff --git a/electron/native/wgc-capture/src/mf_encoder.h b/electron/native/wgc-capture/src/mf_encoder.h
new file mode 100644
index 000000000..b6db68585
--- /dev/null
+++ b/electron/native/wgc-capture/src/mf_encoder.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <Windows.h>
+#include <d3d11.h>
+#include <mfapi.h>
+#include <mfidl.h>
+#include <mfreadwrite.h>
+#include <wrl/client.h>
+
+#include <cstdint>
+#include <mutex>
+#include <string>
+
+struct AudioInputFormat {
+    GUID subtype = MFAudioFormat_PCM;
+    UINT32 sampleRate = 0;
+    UINT32 channels = 0;
+    UINT32 bitsPerSample = 0;
+    UINT32 blockAlign = 0;
+    UINT32 avgBytesPerSec = 0;
+};
+
+class MFEncoder {
+public:
+    MFEncoder() = default;
+    ~MFEncoder();
+
+    MFEncoder(const MFEncoder&) = delete;
+    MFEncoder& operator=(const MFEncoder&) = delete;
+
+    bool initialize(
+        const std::wstring& outputPath,
+        int width,
+        int height,
+        int fps,
+        int bitrate,
+        ID3D11Device* device,
+        ID3D11DeviceContext* context,
+        const AudioInputFormat* audioFormat = nullptr);
+    bool writeFrame(ID3D11Texture2D* texture, int64_t timestampHns);
+    bool writeAudio(const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns);
+    bool finalize();
+
+private:
+    bool ensureStagingTexture(ID3D11Texture2D* texture);
+    bool copyFrameToBuffer(ID3D11Texture2D* texture, BYTE* destination, DWORD destinationSize);
+    bool configureAudioStream(const AudioInputFormat& audioFormat);
+
+    Microsoft::WRL::ComPtr<IMFSinkWriter> sinkWriter_;
+    Microsoft::WRL::ComPtr<ID3D11Device> device_;
+    Microsoft::WRL::ComPtr<ID3D11DeviceContext> context_;
+    Microsoft::WRL::ComPtr<ID3D11Texture2D> stagingTexture_;
+    std::mutex writerMutex_;
+    DWORD videoStreamIndex_ = 0;
+    DWORD audioStreamIndex_ = 0;
+    bool hasAudioStream_ = false;
+    int width_ = 0;
+    int height_ = 0;
+    int fps_ = 60;
+    int64_t firstTimestampHns_ = -1;
+    int64_t lastTimestampHns_ = -1;
+    bool finalized_ = false;
+};
diff --git a/electron/native/wgc-capture/src/monitor_utils.cpp b/electron/native/wgc-capture/src/monitor_utils.cpp
new file mode 100644
index 000000000..f83e77d1b
--- /dev/null
+++ b/electron/native/wgc-capture/src/monitor_utils.cpp
@@ -0,0 +1,88 @@
+#include "monitor_utils.h"
+
+#include <algorithm>
+#include <cmath>
+#include <vector>
+
+namespace {
+
+struct MonitorCandidate {
+    HMONITOR monitor = nullptr;
+    RECT rect{};
+};
+
+std::vector<MonitorCandidate> enumerateMonitors() {
+    std::vector<MonitorCandidate> monitors;
+    EnumDisplayMonitors(
+        nullptr,
+        nullptr,
+        [](HMONITOR monitor, HDC, LPRECT rect, LPARAM userData) -> BOOL {
+            auto* result = reinterpret_cast<std::vector<MonitorCandidate>*>(userData);
+            result->push_back({monitor, *rect});
+            return TRUE;
+        },
+        reinterpret_cast<LPARAM>(&monitors));
+    return monitors;
+}
+
+bool rectMatchesBounds(const RECT& rect, const MonitorBounds& bounds) {
+    return rect.left == bounds.x &&
+           rect.top == bounds.y &&
+           (rect.right - rect.left) == bounds.width &&
+           (rect.bottom - rect.top) == bounds.height;
+}
+
+int64_t overlapArea(const RECT& rect, const MonitorBounds& bounds) {
+    const LONG left = std::max<LONG>(rect.left, bounds.x);
+    const LONG top = std::max<LONG>(rect.top, bounds.y);
+    const LONG right = std::min<LONG>(rect.right, bounds.x + bounds.width);
+    const LONG bottom = std::min<LONG>(rect.bottom, bounds.y + bounds.height);
+    if (right <= left || bottom <= top) {
+        return 0;
+    }
+    return static_cast<int64_t>(right - left) * static_cast<int64_t>(bottom - top);
+}
+
+} // namespace
+
+HMONITOR findMonitorForCapture(int64_t displayId, const MonitorBounds* bounds) {
+    const auto monitors = enumerateMonitors();
+    if (monitors.empty()) {
+        return MonitorFromPoint({0, 0}, MONITOR_DEFAULTTOPRIMARY);
+    }
+
+    // Electron's display_id is not stable across all Windows capture backends.
+    // Bounds are the most reliable contract because they come from Electron's
+    // selected display and match the WGC monitor coordinate space.
+    if (bounds && bounds->width > 0 && bounds->height > 0) {
+        for (const auto& candidate : monitors) {
+            if (rectMatchesBounds(candidate.rect, *bounds)) {
+                return candidate.monitor;
+            }
+        }
+
+        HMONITOR bestMonitor = nullptr;
+        int64_t bestArea = 0;
+        for (const auto& candidate : monitors) {
+            const int64_t area = overlapArea(candidate.rect, *bounds);
+            if (area > bestArea) {
+                bestArea = area;
+                bestMonitor = candidate.monitor;
+            }
+        }
+        if (bestMonitor) {
+            return bestMonitor;
+        }
+    }
+
+    // Best-effort fallback for helpers invoked without bounds. Some callers pass
+    // zero-based ids while Win32 monitor handles are pointer values, so only use
+    // this when it exactly matches the HMONITOR value.
+    for (const auto& candidate : monitors) {
+        if (reinterpret_cast<int64_t>(candidate.monitor) == displayId) {
+            return candidate.monitor;
+        }
+    }
+
+    return MonitorFromPoint({0, 0}, MONITOR_DEFAULTTOPRIMARY);
+}
diff --git a/electron/native/wgc-capture/src/monitor_utils.h b/electron/native/wgc-capture/src/monitor_utils.h
new file mode 100644
index 000000000..11d5d8375
--- /dev/null
+++ b/electron/native/wgc-capture/src/monitor_utils.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Windows.h>
+
+#include <cstdint>
+
+struct MonitorBounds {
+    int x = 0;
+    int y = 0;
+    int width = 0;
+    int height = 0;
+};
+
+HMONITOR findMonitorForCapture(int64_t displayId, const MonitorBounds* bounds);
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
new file mode 100644
index 000000000..e4f254e66
--- /dev/null
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
@@ -0,0 +1,205 @@
+#include "wasapi_loopback_capture.h"
+
+#include <ksmedia.h>
+
+#include <algorithm>
+#include <chrono>
+#include <iostream>
+
+namespace {
+
+constexpr REFERENCE_TIME BufferDurationHns = 10'000'000;
+constexpr int64_t HnsPerSecond = 10'000'000;
+
+bool succeeded(HRESULT hr, const char* label) {
+    if (SUCCEEDED(hr)) {
+        return true;
+    }
+
+    std::cerr << "ERROR: " << label << " failed (hr=0x" << std::hex << hr << std::dec << ")"
+              << std::endl;
+    return false;
+}
+
+GUID audioSubtypeFromFormat(WAVEFORMATEX* format) {
+    if (format->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) {
+        return MFAudioFormat_Float;
+    }
+    if (format->wFormatTag == WAVE_FORMAT_PCM) {
+        return MFAudioFormat_PCM;
+    }
+    if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
+        format->cbSize >= sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) {
+        auto* extensible = reinterpret_cast<WAVEFORMATEXTENSIBLE*>(format);
+        if (extensible->SubFormat == KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) {
+            return MFAudioFormat_Float;
+        }
+        if (extensible->SubFormat == KSDATAFORMAT_SUBTYPE_PCM) {
+            return MFAudioFormat_PCM;
+        }
+    }
+    return GUID_NULL;
+}
+
+} // namespace
+
+WasapiLoopbackCapture::~WasapiLoopbackCapture() {
+    stop();
+    if (mixFormat_) {
+        CoTaskMemFree(mixFormat_);
+        mixFormat_ = nullptr;
+    }
+}
+
+bool WasapiLoopbackCapture::initialize() {
+    HRESULT hr = CoCreateInstance(
+        __uuidof(MMDeviceEnumerator),
+        nullptr,
+        CLSCTX_ALL,
+        IID_PPV_ARGS(&deviceEnumerator_));
+    if (!succeeded(hr, "CoCreateInstance(MMDeviceEnumerator)")) {
+        return false;
+    }
+
+    hr = deviceEnumerator_->GetDefaultAudioEndpoint(eRender, eConsole, &device_);
+    if (!succeeded(hr, "GetDefaultAudioEndpoint(render)")) {
+        return false;
+    }
+
+    hr = device_->Activate(__uuidof(IAudioClient), CLSCTX_ALL, nullptr, &audioClient_);
+    if (!succeeded(hr, "IMMDevice::Activate(IAudioClient)")) {
+        return false;
+    }
+
+    hr = audioClient_->GetMixFormat(&mixFormat_);
+    if (!succeeded(hr, "IAudioClient::GetMixFormat") || !mixFormat_) {
+        return false;
+    }
+
+    if (!resolveInputFormat(mixFormat_)) {
+        std::cerr << "ERROR: Unsupported WASAPI loopback mix format" << std::endl;
+        return false;
+    }
+
+    hr = audioClient_->Initialize(
+        AUDCLNT_SHAREMODE_SHARED,
+        AUDCLNT_STREAMFLAGS_LOOPBACK,
+        BufferDurationHns,
+        0,
+        mixFormat_,
+        nullptr);
+    if (!succeeded(hr, "IAudioClient::Initialize(loopback)")) {
+        return false;
+    }
+
+    hr = audioClient_->GetService(IID_PPV_ARGS(&captureClient_));
+    if (!succeeded(hr, "IAudioClient::GetService(IAudioCaptureClient)")) {
+        return false;
+    }
+
+    return true;
+}
+
+bool WasapiLoopbackCapture::resolveInputFormat(WAVEFORMATEX* mixFormat) {
+    const GUID subtype = audioSubtypeFromFormat(mixFormat);
+    if (subtype == GUID_NULL) {
+        return false;
+    }
+
+    inputFormat_.subtype = subtype;
+    inputFormat_.sampleRate = mixFormat->nSamplesPerSec;
+    inputFormat_.channels = mixFormat->nChannels;
+    inputFormat_.bitsPerSample = mixFormat->wBitsPerSample;
+    inputFormat_.blockAlign = mixFormat->nBlockAlign;
+    inputFormat_.avgBytesPerSec = mixFormat->nAvgBytesPerSec;
+    return inputFormat_.sampleRate > 0 && inputFormat_.channels > 0 && inputFormat_.blockAlign > 0;
+}
+
+bool WasapiLoopbackCapture::start(AudioCallback callback) {
+    if (!audioClient_ || !captureClient_ || !callback) {
+        return false;
+    }
+
+    callback_ = std::move(callback);
+    stopRequested_ = false;
+    writtenFrames_ = 0;
+
+    HRESULT hr = audioClient_->Start();
+    if (!succeeded(hr, "IAudioClient::Start")) {
+        return false;
+    }
+
+    thread_ = std::thread([this] {
+        captureLoop();
+    });
+    return true;
+}
+
+void WasapiLoopbackCapture::stop() {
+    stopRequested_ = true;
+    if (thread_.joinable()) {
+        thread_.join();
+    }
+    if (audioClient_) {
+        audioClient_->Stop();
+    }
+}
+
+const AudioInputFormat& WasapiLoopbackCapture::inputFormat() const {
+    return inputFormat_;
+}
+
+void WasapiLoopbackCapture::captureLoop() {
+    while (!stopRequested_) {
+        UINT32 packetFrames = 0;
+        HRESULT hr = captureClient_->GetNextPacketSize(&packetFrames);
+        if (FAILED(hr)) {
+            std::cerr << "ERROR: IAudioCaptureClient::GetNextPacketSize failed (hr=0x" << std::hex
+                      << hr << std::dec << ")" << std::endl;
+            break;
+        }
+
+        while (packetFrames > 0 && !stopRequested_) {
+            BYTE* data = nullptr;
+            UINT32 framesAvailable = 0;
+            DWORD flags = 0;
+
+            hr = captureClient_->GetBuffer(&data, &framesAvailable, &flags, nullptr, nullptr);
+            if (FAILED(hr)) {
+                std::cerr << "ERROR: IAudioCaptureClient::GetBuffer failed (hr=0x" << std::hex
+                          << hr << std::dec << ")" << std::endl;
+                break;
+            }
+
+            const DWORD byteCount = framesAvailable * inputFormat_.blockAlign;
+            const int64_t timestampHns =
+                static_cast<int64_t>((writtenFrames_ * HnsPerSecond) / inputFormat_.sampleRate);
+            const int64_t durationHns =
+                static_cast<int64_t>((static_cast<uint64_t>(framesAvailable) * HnsPerSecond) /
+                                     inputFormat_.sampleRate);
+
+            if (byteCount > 0) {
+                if ((flags & AUDCLNT_BUFFERFLAGS_SILENT) != 0 || !data) {
+                    silenceBuffer_.assign(byteCount, 0);
+                    callback_(silenceBuffer_.data(), byteCount, timestampHns, durationHns);
+                } else {
+                    callback_(data, byteCount, timestampHns, durationHns);
+                }
+            }
+
+            writtenFrames_ += framesAvailable;
+            captureClient_->ReleaseBuffer(framesAvailable);
+
+            hr = captureClient_->GetNextPacketSize(&packetFrames);
+            if (FAILED(hr)) {
+                std::cerr << "ERROR: IAudioCaptureClient::GetNextPacketSize failed (hr=0x"
+                          << std::hex << hr << std::dec << ")" << std::endl;
+                packetFrames = 0;
+                break;
+            }
+        }
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(5));
+    }
+
+}
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.h b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
new file mode 100644
index 000000000..e6fb7e8b0
--- /dev/null
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "mf_encoder.h"
+
+#include <Windows.h>
+#include <audioclient.h>
+#include <mmdeviceapi.h>
+#include <wrl/client.h>
+
+#include <atomic>
+#include <cstdint>
+#include <functional>
+#include <thread>
+#include <vector>
+
+class WasapiLoopbackCapture {
+public:
+    using AudioCallback = std::function<void(const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns)>;
+
+    WasapiLoopbackCapture() = default;
+    ~WasapiLoopbackCapture();
+
+    WasapiLoopbackCapture(const WasapiLoopbackCapture&) = delete;
+    WasapiLoopbackCapture& operator=(const WasapiLoopbackCapture&) = delete;
+
+    bool initialize();
+    bool start(AudioCallback callback);
+    void stop();
+
+    const AudioInputFormat& inputFormat() const;
+
+private:
+    void captureLoop();
+    bool resolveInputFormat(WAVEFORMATEX* mixFormat);
+
+    Microsoft::WRL::ComPtr<IMMDeviceEnumerator> deviceEnumerator_;
+    Microsoft::WRL::ComPtr<IMMDevice> device_;
+    Microsoft::WRL::ComPtr<IAudioClient> audioClient_;
+    Microsoft::WRL::ComPtr<IAudioCaptureClient> captureClient_;
+    WAVEFORMATEX* mixFormat_ = nullptr;
+    AudioInputFormat inputFormat_{};
+    AudioCallback callback_;
+    std::thread thread_;
+    std::atomic<bool> stopRequested_ = false;
+    std::vector<BYTE> silenceBuffer_;
+    uint64_t writtenFrames_ = 0;
+};
diff --git a/electron/native/wgc-capture/src/wgc_session.cpp b/electron/native/wgc-capture/src/wgc_session.cpp
new file mode 100644
index 000000000..c25444e02
--- /dev/null
+++ b/electron/native/wgc-capture/src/wgc_session.cpp
@@ -0,0 +1,223 @@
+#include "wgc_session.h"
+
+#include <Windows.Graphics.Capture.Interop.h>
+#include <dxgi1_2.h>
+#include <inspectable.h>
+#include <winrt/base.h>
+
+#include <iostream>
+
+namespace wf = winrt::Windows::Foundation;
+namespace wgcap = winrt::Windows::Graphics::Capture;
+namespace wgdx = winrt::Windows::Graphics::DirectX;
+namespace wgd3d = winrt::Windows::Graphics::DirectX::Direct3D11;
+
+extern "C" HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice(
+    ::IDXGIDevice* dxgiDevice,
+    ::IInspectable** graphicsDevice);
+
+namespace {
+
+bool succeeded(HRESULT hr, const char* label) {
+    if (SUCCEEDED(hr)) {
+        return true;
+    }
+
+    std::cerr << "ERROR: " << label << " failed (hr=0x" << std::hex << hr << std::dec << ")"
+              << std::endl;
+    return false;
+}
+
+int64_t timeSpanToHns(wf::TimeSpan const& value) {
+    return value.count();
+}
+
+} // namespace
+
+WgcSession::~WgcSession() {
+    stop();
+}
+
+bool WgcSession::createD3DDevice() {
+    UINT flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
+#if defined(_DEBUG)
+    flags |= D3D11_CREATE_DEVICE_DEBUG;
+#endif
+
+    D3D_FEATURE_LEVEL featureLevels[] = {
+        D3D_FEATURE_LEVEL_11_1,
+        D3D_FEATURE_LEVEL_11_0,
+        D3D_FEATURE_LEVEL_10_1,
+        D3D_FEATURE_LEVEL_10_0,
+    };
+    D3D_FEATURE_LEVEL featureLevel{};
+
+    HRESULT hr = D3D11CreateDevice(
+        nullptr,
+        D3D_DRIVER_TYPE_HARDWARE,
+        nullptr,
+        flags,
+        featureLevels,
+        ARRAYSIZE(featureLevels),
+        D3D11_SDK_VERSION,
+        &d3dDevice_,
+        &featureLevel,
+        &d3dContext_);
+
+#if defined(_DEBUG)
+    if (FAILED(hr)) {
+        flags &= ~D3D11_CREATE_DEVICE_DEBUG;
+        hr = D3D11CreateDevice(
+            nullptr,
+            D3D_DRIVER_TYPE_HARDWARE,
+            nullptr,
+            flags,
+            featureLevels,
+            ARRAYSIZE(featureLevels),
+            D3D11_SDK_VERSION,
+            &d3dDevice_,
+            &featureLevel,
+            &d3dContext_);
+    }
+#endif
+
+    if (!succeeded(hr, "D3D11CreateDevice")) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IDXGIDevice> dxgiDevice;
+    if (!succeeded(d3dDevice_.As(&dxgiDevice), "Query IDXGIDevice")) {
+        return false;
+    }
+
+    winrt::com_ptr<::IInspectable> inspectableDevice;
+    if (!succeeded(CreateDirect3D11DeviceFromDXGIDevice(dxgiDevice.Get(), inspectableDevice.put()),
+                   "CreateDirect3D11DeviceFromDXGIDevice")) {
+        return false;
+    }
+
+    winrtDevice_ = inspectableDevice.as<wgd3d::IDirect3DDevice>();
+    return true;
+}
+
+bool WgcSession::createCaptureItem(HMONITOR monitor) {
+    auto factory = winrt::get_activation_factory<wgcap::GraphicsCaptureItem>();
+    auto interop = factory.as<IGraphicsCaptureItemInterop>();
+
+    wgcap::GraphicsCaptureItem item{nullptr};
+    HRESULT hr = interop->CreateForMonitor(
+        monitor,
+        winrt::guid_of<wgcap::GraphicsCaptureItem>(),
+        reinterpret_cast<void**>(winrt::put_abi(item)));
+    if (!succeeded(hr, "CreateForMonitor")) {
+        return false;
+    }
+
+    item_ = item;
+    const auto size = item_.Size();
+    width_ = static_cast<int>(size.Width);
+    height_ = static_cast<int>(size.Height);
+    return width_ > 0 && height_ > 0;
+}
+
+bool WgcSession::initialize(HMONITOR monitor, int fps) {
+    fps_ = fps > 0 ? fps : 60;
+    if (!createD3DDevice()) {
+        return false;
+    }
+    if (!createCaptureItem(monitor)) {
+        return false;
+    }
+
+    framePool_ = wgcap::Direct3D11CaptureFramePool::CreateFreeThreaded(
+        winrtDevice_,
+        wgdx::DirectXPixelFormat::B8G8R8A8UIntNormalized,
+        2,
+        item_.Size());
+    session_ = framePool_.CreateCaptureSession(item_);
+
+    try {
+        session_.IsCursorCaptureEnabled(false);
+    } catch (...) {
+        // Older WGC builds can omit this property; callers still overlay their own cursor.
+    }
+
+    frameArrivedToken_ = framePool_.FrameArrived({this, &WgcSession::onFrameArrived});
+    return true;
+}
+
+void WgcSession::setFrameCallback(FrameCallback callback) {
+    std::scoped_lock lock(callbackMutex_);
+    frameCallback_ = std::move(callback);
+}
+
+bool WgcSession::start() {
+    if (!session_) {
+        return false;
+    }
+    session_.StartCapture();
+    started_ = true;
+    return true;
+}
+
+void WgcSession::stop() {
+    if (framePool_) {
+        framePool_.FrameArrived(frameArrivedToken_);
+    }
+    if (session_) {
+        session_.Close();
+        session_ = nullptr;
+    }
+    if (framePool_) {
+        framePool_.Close();
+        framePool_ = nullptr;
+    }
+    item_ = nullptr;
+    winrtDevice_ = nullptr;
+    d3dContext_.Reset();
+    d3dDevice_.Reset();
+    started_ = false;
+}
+
+void WgcSession::onFrameArrived(
+    wgcap::Direct3D11CaptureFramePool const& sender,
+    wf::IInspectable const&) {
+    auto frame = sender.TryGetNextFrame();
+    if (!frame) {
+        return;
+    }
+
+    auto surface = frame.Surface();
+    auto access = surface.as<::Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>();
+    Microsoft::WRL::ComPtr<ID3D11Texture2D> texture;
+    HRESULT hr = access->GetInterface(__uuidof(ID3D11Texture2D), reinterpret_cast<void**>(texture.GetAddressOf()));
+    if (FAILED(hr) || !texture) {
+        return;
+    }
+
+    FrameCallback callback;
+    {
+        std::scoped_lock lock(callbackMutex_);
+        callback = frameCallback_;
+    }
+
+    if (callback) {
+        callback(texture.Get(), timeSpanToHns(frame.SystemRelativeTime()));
+    }
+}
+
+int WgcSession::captureWidth() const {
+    return width_;
+}
+
+int WgcSession::captureHeight() const {
+    return height_;
+}
+
+ID3D11Device* WgcSession::device() const {
+    return d3dDevice_.Get();
+}
+
+ID3D11DeviceContext* WgcSession::context() const {
+    return d3dContext_.Get();
+}
diff --git a/electron/native/wgc-capture/src/wgc_session.h b/electron/native/wgc-capture/src/wgc_session.h
new file mode 100644
index 000000000..8cfb05042
--- /dev/null
+++ b/electron/native/wgc-capture/src/wgc_session.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <Windows.h>
+#include <d3d11.h>
+#include <windows.graphics.capture.h>
+#include <windows.graphics.directx.direct3d11.interop.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Graphics.Capture.h>
+#include <winrt/Windows.Graphics.DirectX.Direct3D11.h>
+#include <wrl/client.h>
+
+#include <functional>
+#include <mutex>
+
+class WgcSession {
+public:
+    using FrameCallback = std::function<void(ID3D11Texture2D*, int64_t)>;
+
+    WgcSession() = default;
+    ~WgcSession();
+
+    WgcSession(const WgcSession&) = delete;
+    WgcSession& operator=(const WgcSession&) = delete;
+
+    bool initialize(HMONITOR monitor, int fps);
+    void setFrameCallback(FrameCallback callback);
+    bool start();
+    void stop();
+
+    int captureWidth() const;
+    int captureHeight() const;
+    ID3D11Device* device() const;
+    ID3D11DeviceContext* context() const;
+
+private:
+    bool createD3DDevice();
+    bool createCaptureItem(HMONITOR monitor);
+    void onFrameArrived(
+        winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const& sender,
+        winrt::Windows::Foundation::IInspectable const&);
+
+    Microsoft::WRL::ComPtr<ID3D11Device> d3dDevice_;
+    Microsoft::WRL::ComPtr<ID3D11DeviceContext> d3dContext_;
+    winrt::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice winrtDevice_{nullptr};
+    winrt::Windows::Graphics::Capture::GraphicsCaptureItem item_{nullptr};
+    winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool framePool_{nullptr};
+    winrt::Windows::Graphics::Capture::GraphicsCaptureSession session_{nullptr};
+    winrt::event_token frameArrivedToken_{};
+    FrameCallback frameCallback_;
+    std::mutex callbackMutex_;
+    int width_ = 0;
+    int height_ = 0;
+    int fps_ = 60;
+    bool started_ = false;
+};
diff --git a/electron/preload.ts b/electron/preload.ts
index 1049bc982..6742a3a7f 100644
--- a/electron/preload.ts
+++ b/electron/preload.ts
@@ -1,4 +1,5 @@
 import { contextBridge, ipcRenderer } from "electron";
+import type { NativeWindowsRecordingRequest } from "../src/lib/nativeWindowsRecording";
 import type { RecordingSession, StoreRecordedSessionInput } from "../src/lib/recordingSession";
 import { NATIVE_BRIDGE_CHANNEL, type NativeBridgeRequest } from "../src/native/contracts";
 
@@ -61,6 +62,15 @@ contextBridge.exposeInMainWorld("electronAPI", {
 	setRecordingState: (recording: boolean, recordingId?: number) => {
 		return ipcRenderer.invoke("set-recording-state", recording, recordingId);
 	},
+	isNativeWindowsCaptureAvailable: () => {
+		return ipcRenderer.invoke("is-native-windows-capture-available");
+	},
+	startNativeWindowsRecording: (request: NativeWindowsRecordingRequest) => {
+		return ipcRenderer.invoke("start-native-windows-recording", request);
+	},
+	stopNativeWindowsRecording: (discard?: boolean) => {
+		return ipcRenderer.invoke("stop-native-windows-recording", discard);
+	},
 	getCursorTelemetry: (videoPath?: string) => {
 		return ipcRenderer.invoke("get-cursor-telemetry", videoPath);
 	},
diff --git a/package.json b/package.json
index 1826a8697..d5bb922e5 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,16 @@
 		"lint:fix": "biome check --write .",
 		"format": "biome format --write .",
 		"i18n:check": "node scripts/i18n-check.mjs",
-	"preview": "vite preview",
-	"build:mac": "tsc && vite build && electron-builder --mac",
-	"build:win": "tsc && vite build && electron-builder --win --config.npmRebuild=false",
-	"build:linux": "tsc && vite build && electron-builder --linux AppImage deb pacman --config.npmRebuild=false",
-	"test": "vitest --run",
+		"preview": "vite preview",
+		"build:mac": "tsc && vite build && electron-builder --mac",
+		"build:native:win": "node scripts/build-windows-wgc-helper.mjs",
+		"build:win": "npm run build:native:win && tsc && vite build && electron-builder --win --config.npmRebuild=false",
+		"build:linux": "tsc && vite build && electron-builder --linux AppImage deb pacman --config.npmRebuild=false",
+		"test": "vitest --run",
 		"test:watch": "vitest",
 		"test:cursor-native:win": "node scripts/test-windows-native-cursor.mjs",
+		"test:wgc-helper:win": "node scripts/test-windows-wgc-helper.mjs",
+		"test:wgc-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio",
 		"capture:openscreen-preview": "node scripts/capture-openscreen-preview.mjs",
 		"build-vite": "tsc && vite build",
 		"test:browser": "vitest --config vitest.browser.config.ts --run",
diff --git a/scripts/build-windows-wgc-helper.mjs b/scripts/build-windows-wgc-helper.mjs
new file mode 100644
index 000000000..85da01e57
--- /dev/null
+++ b/scripts/build-windows-wgc-helper.mjs
@@ -0,0 +1,112 @@
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ROOT = path.join(__dirname, "..");
+const SOURCE_DIR = path.join(ROOT, "electron", "native", "wgc-capture");
+const BUILD_DIR = path.join(SOURCE_DIR, "build");
+const COMPAT_LIB_DIR = path.join(BUILD_DIR, "compat-libs");
+const BIN_DIR = path.join(ROOT, "electron", "native", "bin", "win32-x64");
+const CMAKE = process.env.CMAKE_EXE ?? "cmake";
+
+function findVcVarsAll() {
+	const explicit = process.env.VCVARSALL;
+	if (explicit && fs.existsSync(explicit)) {
+		return explicit;
+	}
+
+	const roots = [
+		process.env.VSINSTALLDIR,
+		"C:\\Program Files\\Microsoft Visual Studio\\2022\\Community",
+		"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional",
+		"C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise",
+		"C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools",
+		"C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\Community",
+	];
+
+	for (const root of roots.filter(Boolean)) {
+		const candidate = path.join(root, "VC", "Auxiliary", "Build", "vcvarsall.bat");
+		if (fs.existsSync(candidate)) {
+			return candidate;
+		}
+	}
+
+	return null;
+}
+
+function run(command, args, options = {}) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(command, args, {
+			cwd: ROOT,
+			stdio: "inherit",
+			windowsHide: true,
+			...options,
+		});
+		child.once("error", reject);
+		child.once("exit", (code) => {
+			if (code === 0) {
+				resolve();
+			} else {
+				reject(new Error(`${command} ${args.join(" ")} failed with code ${code}`));
+			}
+		});
+	});
+}
+
+async function runInVsEnv(command) {
+	const vcvarsAll = findVcVarsAll();
+	if (!vcvarsAll) {
+		throw new Error(
+			"Could not find Visual Studio vcvarsall.bat. Install Visual Studio Build Tools with C++.",
+		);
+	}
+
+	const cmdPath = path.join(os.tmpdir(), `openscreen-build-wgc-${process.pid}-${Date.now()}.cmd`);
+	fs.writeFileSync(
+		cmdPath,
+		[
+			"@echo off",
+			`call "${vcvarsAll}" x64`,
+			"if errorlevel 1 exit /b %errorlevel%",
+			`if not exist "${COMPAT_LIB_DIR}" mkdir "${COMPAT_LIB_DIR}"`,
+			`for %%L in (gdi32.lib winspool.lib shell32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib) do if not exist "%WindowsSdkDir%Lib\\%WindowsSDKLibVersion%um\\x64\\%%L" copy /Y "%WindowsSdkDir%Lib\\%WindowsSDKLibVersion%um\\x64\\kernel32.Lib" "${COMPAT_LIB_DIR}\\%%L" >nul`,
+			"if errorlevel 1 exit /b %errorlevel%",
+			`set "LIB=${COMPAT_LIB_DIR};%LIB%"`,
+			command,
+			"exit /b %errorlevel%",
+			"",
+		].join("\r\n"),
+	);
+	try {
+		await run("cmd.exe", ["/d", "/c", cmdPath]);
+	} finally {
+		fs.rmSync(cmdPath, { force: true });
+	}
+}
+
+if (process.platform !== "win32") {
+	console.log("Skipping WGC helper build: Windows-only.");
+	process.exit(0);
+}
+
+fs.mkdirSync(BUILD_DIR, { recursive: true });
+
+await runInVsEnv(
+	`"${CMAKE}" -S "${SOURCE_DIR}" -B "${BUILD_DIR}" -G Ninja -DCMAKE_BUILD_TYPE=Release`,
+);
+await runInVsEnv(`"${CMAKE}" --build "${BUILD_DIR}" --config Release`);
+
+const outputPath = path.join(BUILD_DIR, "wgc-capture.exe");
+if (!fs.existsSync(outputPath)) {
+	throw new Error(`WGC helper build completed but ${outputPath} was not found.`);
+}
+
+fs.mkdirSync(BIN_DIR, { recursive: true });
+const distributablePath = path.join(BIN_DIR, "wgc-capture.exe");
+fs.copyFileSync(outputPath, distributablePath);
+
+console.log(`Built ${outputPath}`);
+console.log(`Copied ${distributablePath}`);
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
new file mode 100644
index 000000000..627c0cab8
--- /dev/null
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -0,0 +1,167 @@
+import { spawn, spawnSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ROOT = path.join(__dirname, "..");
+const HELPER_PATH =
+	process.env.OPENSCREEN_WGC_CAPTURE_EXE ??
+	path.join(ROOT, "electron", "native", "bin", "win32-x64", "wgc-capture.exe");
+
+const DURATION_MS = Number(process.env.OPENSCREEN_WGC_TEST_DURATION_MS ?? 5000);
+const WITH_SYSTEM_AUDIO =
+	process.env.OPENSCREEN_WGC_TEST_SYSTEM_AUDIO === "true" ||
+	process.argv.includes("--system-audio");
+
+function runHelper(config) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(HELPER_PATH, [JSON.stringify(config)], {
+			stdio: ["pipe", "pipe", "pipe"],
+			windowsHide: true,
+		});
+
+		let stdout = "";
+		let stderr = "";
+
+		child.stdout.on("data", (chunk) => {
+			stdout += chunk.toString();
+		});
+		child.stderr.on("data", (chunk) => {
+			stderr += chunk.toString();
+		});
+		child.once("error", reject);
+		child.once("exit", (code) => {
+			resolve({ code, stdout, stderr });
+		});
+
+		setTimeout(() => {
+			child.stdin.write("stop\n");
+		}, DURATION_MS);
+	});
+}
+
+function probeStreams(outputPath) {
+	const ffprobe = spawnSync(
+		"ffprobe",
+		["-v", "error", "-show_streams", "-of", "json", outputPath],
+		{ encoding: "utf8", windowsHide: true },
+	);
+	if (ffprobe.status !== 0) {
+		throw new Error(`ffprobe failed: ${ffprobe.stderr || ffprobe.stdout}`);
+	}
+	return JSON.parse(ffprobe.stdout).streams ?? [];
+}
+
+function measureFirstFrameLuma(outputPath) {
+	const ffmpeg = spawnSync(
+		"ffmpeg",
+		[
+			"-v",
+			"error",
+			"-i",
+			outputPath,
+			"-frames:v",
+			"1",
+			"-f",
+			"rawvideo",
+			"-pix_fmt",
+			"gray",
+			"pipe:1",
+		],
+		{ windowsHide: true, maxBuffer: 64 * 1024 * 1024 },
+	);
+	if (ffmpeg.status !== 0) {
+		throw new Error(`ffmpeg frame extraction failed: ${ffmpeg.stderr?.toString() ?? ""}`);
+	}
+	const data = ffmpeg.stdout;
+	if (!data || data.length === 0) {
+		throw new Error(`ffmpeg did not return frame data for ${outputPath}`);
+	}
+	let sum = 0;
+	let max = 0;
+	for (const value of data) {
+		sum += value;
+		if (value > max) {
+			max = value;
+		}
+	}
+	return { average: sum / data.length, max };
+}
+
+if (process.platform !== "win32") {
+	console.log("Skipping WGC helper smoke test: Windows-only.");
+	process.exit(0);
+}
+
+if (!fs.existsSync(HELPER_PATH)) {
+	throw new Error(`WGC helper not found at ${HELPER_PATH}. Run npm run build:native:win first.`);
+}
+
+const outputPath = path.join(
+	os.tmpdir(),
+	`openscreen-wgc-helper-${WITH_SYSTEM_AUDIO ? "audio" : "video"}-${Date.now()}.mp4`,
+);
+
+const config = {
+	schemaVersion: 2,
+	recordingId: Date.now(),
+	outputPath,
+	sourceType: "display",
+	sourceId: "screen:0:0",
+	displayId: 0,
+	fps: 30,
+	videoWidth: 1280,
+	videoHeight: 720,
+	displayX: 0,
+	displayY: 0,
+	displayW: 1920,
+	displayH: 1080,
+	hasDisplayBounds: true,
+	captureSystemAudio: WITH_SYSTEM_AUDIO,
+	captureMic: false,
+	webcamEnabled: false,
+	outputs: { screenPath: outputPath },
+};
+
+const result = await runHelper(config);
+if (result.code !== 0) {
+	throw new Error(`WGC helper exited with ${result.code}\n${result.stdout}\n${result.stderr}`);
+}
+if (!fs.existsSync(outputPath) || fs.statSync(outputPath).size === 0) {
+	throw new Error(`WGC helper did not produce a video at ${outputPath}`);
+}
+
+const streams = probeStreams(outputPath);
+const hasVideo = streams.some((stream) => stream.codec_type === "video");
+const hasAudio = streams.some((stream) => stream.codec_type === "audio");
+if (!hasVideo) {
+	throw new Error(`WGC helper output has no video stream: ${outputPath}`);
+}
+if (WITH_SYSTEM_AUDIO && !hasAudio) {
+	throw new Error(`WGC helper output has no audio stream: ${outputPath}`);
+}
+const frameLuma = measureFirstFrameLuma(outputPath);
+if (frameLuma.average < 1 && frameLuma.max < 5) {
+	throw new Error(`WGC helper output first frame is black: ${outputPath}`);
+}
+
+console.log(
+	JSON.stringify(
+		{
+			success: true,
+			outputPath,
+			bytes: fs.statSync(outputPath).size,
+			streams: streams.map((stream) => ({
+				index: stream.index,
+				codecType: stream.codec_type,
+				codecName: stream.codec_name,
+				duration: stream.duration,
+			})),
+			firstFrameLuma: frameLuma,
+		},
+		null,
+		2,
+	),
+);
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index 83269ee08..0cf0187fb 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -1930,7 +1930,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					src={videoPath}
 					className="hidden"
 					preload="auto"
-					muted
 					playsInline
 					onLoadedMetadata={handleLoadedMetadata}
 					onDurationChange={(e) => {
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 717a6cdf0..1ae9d2262 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -2,6 +2,7 @@ import { fixWebmDuration } from "@fix-webm-duration/fix";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import { useScopedT } from "@/contexts/I18nContext";
+import type { NativeWindowsRecordingRequest } from "@/lib/nativeWindowsRecording";
 import { requestCameraAccess } from "@/lib/requestCameraAccess";
 
 const TARGET_FRAME_RATE = 60;
@@ -62,6 +63,11 @@ type RecorderHandle = {
 	recordedBlobPromise: Promise<Blob>;
 };
 
+type NativeWindowsRecordingHandle = {
+	recordingId: number;
+	finalizing: boolean;
+};
+
 function createRecorderHandle(stream: MediaStream, options: MediaRecorderOptions): RecorderHandle {
 	const recorder = new MediaRecorder(stream, options);
 	const chunks: Blob[] = [];
@@ -96,6 +102,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const [webcamEnabled, setWebcamEnabledState] = useState(false);
 	const screenRecorder = useRef<RecorderHandle | null>(null);
 	const webcamRecorder = useRef<RecorderHandle | null>(null);
+	const nativeWindowsRecording = useRef<NativeWindowsRecordingHandle | null>(null);
 	const stream = useRef<MediaStream | null>(null);
 	const screenStream = useRef<MediaStream | null>(null);
 	const microphoneStream = useRef<MediaStream | null>(null);
@@ -365,7 +372,58 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		[teardownMedia],
 	);
 
+	const finalizeNativeWindowsRecording = useCallback(async (discard = false) => {
+		const activeNativeRecording = nativeWindowsRecording.current;
+		if (!activeNativeRecording || activeNativeRecording.finalizing) {
+			return false;
+		}
+
+		activeNativeRecording.finalizing = true;
+		nativeWindowsRecording.current = null;
+		setRecording(false);
+		setPaused(false);
+		setElapsedSeconds(0);
+		accumulatedDurationMs.current = 0;
+		segmentStartedAt.current = null;
+
+		try {
+			const result = await window.electronAPI.stopNativeWindowsRecording(discard);
+			if (discard || result.discarded) {
+				return true;
+			}
+			if (!result.success) {
+				console.error("Failed to stop native Windows recording:", result.error);
+				toast.error(result.error ?? "Failed to stop native Windows recording");
+				return true;
+			}
+
+			if (result.session) {
+				await window.electronAPI.setCurrentRecordingSession(result.session);
+			} else if (result.path) {
+				await window.electronAPI.setCurrentVideoPath(result.path);
+			}
+
+			await window.electronAPI.switchToEditor();
+			return true;
+		} catch (error) {
+			console.error("Error saving native Windows recording:", error);
+			toast.error(
+				error instanceof Error ? error.message : "Failed to save native Windows recording",
+			);
+			return true;
+		} finally {
+			if (discardRecordingId.current === activeNativeRecording.recordingId) {
+				discardRecordingId.current = null;
+			}
+		}
+	}, []);
+
 	const stopRecording = useRef(() => {
+		if (nativeWindowsRecording.current) {
+			void finalizeNativeWindowsRecording(false);
+			return;
+		}
+
 		const activeScreenRecorder = screenRecorder.current;
 		if (!activeScreenRecorder) {
 			return;
@@ -431,6 +489,9 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			allowAutoFinalize.current = false;
 			restarting.current = false;
 			discardRecordingId.current = null;
+			if (nativeWindowsRecording.current) {
+				void finalizeNativeWindowsRecording(true);
+			}
 
 			if (
 				screenRecorder.current?.recorder.state === "recording" ||
@@ -456,7 +517,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			webcamRecorder.current = null;
 			teardownMedia();
 		};
-	}, [teardownMedia, safeHideCountdownOverlay]);
+	}, [teardownMedia, safeHideCountdownOverlay, finalizeNativeWindowsRecording]);
 
 	const safeShowCountdownOverlay = async (value: number, runId: number) => {
 		try {
@@ -486,6 +547,85 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const isCountdownRunActive = (runId?: number) =>
 		runId === undefined || countdownRunId.current === runId;
 
+	const startNativeWindowsRecordingIfAvailable = async (
+		selectedSource: ProcessedDesktopSource,
+		countdownRunToken?: number,
+	) => {
+		try {
+			const platform = await window.electronAPI.getPlatform();
+			if (platform !== "win32") {
+				return false;
+			}
+
+			const availability = await window.electronAPI.isNativeWindowsCaptureAvailable();
+			if (!availability.success || !availability.available) {
+				throw new Error(
+					availability.reason === "missing-helper"
+						? "Native Windows capture helper is not available."
+						: (availability.error ?? "Native Windows capture is not available."),
+				);
+			}
+
+			if (!isCountdownRunActive(countdownRunToken)) {
+				return true;
+			}
+
+			const activeRecordingId = Date.now();
+			const displayId = Number(selectedSource.display_id);
+			const sourceType = selectedSource.id.startsWith("window:") ? "window" : "display";
+			const request: NativeWindowsRecordingRequest = {
+				recordingId: activeRecordingId,
+				source: {
+					type: sourceType,
+					sourceId: selectedSource.id,
+					...(Number.isFinite(displayId) ? { displayId } : {}),
+				},
+				video: {
+					fps: TARGET_FRAME_RATE,
+					width: TARGET_WIDTH,
+					height: TARGET_HEIGHT,
+				},
+				audio: {
+					system: {
+						enabled: systemAudioEnabled,
+					},
+					microphone: {
+						enabled: microphoneEnabled,
+						deviceId: microphoneDeviceId,
+						gain: MIC_GAIN_BOOST,
+					},
+				},
+				webcam: {
+					enabled: webcamEnabled,
+					deviceId: webcamDeviceId,
+					width: WEBCAM_TARGET_WIDTH,
+					height: WEBCAM_TARGET_HEIGHT,
+					fps: WEBCAM_TARGET_FRAME_RATE,
+				},
+			};
+			const result = await window.electronAPI.startNativeWindowsRecording(request);
+			if (!result.success || !result.recordingId) {
+				throw new Error(result.error ?? "Native Windows capture failed.");
+			}
+
+			recordingId.current = result.recordingId;
+			nativeWindowsRecording.current = {
+				recordingId: result.recordingId,
+				finalizing: false,
+			};
+			accumulatedDurationMs.current = 0;
+			segmentStartedAt.current = result.recordingId;
+			allowAutoFinalize.current = true;
+			setRecording(true);
+			setPaused(false);
+			setElapsedSeconds(0);
+			return true;
+		} catch (error) {
+			console.error("Native Windows capture failed:", error);
+			throw error;
+		}
+	};
+
 	const startRecordCountdown = async () => {
 		if (countdownActive || recording) {
 			return;
@@ -573,6 +713,10 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 				return;
 			}
 
+			if (await startNativeWindowsRecordingIfAvailable(selectedSource, countdownRunToken)) {
+				return;
+			}
+
 			let screenMediaStream: MediaStream;
 
 			// getDisplayMedia + setDisplayMediaRequestHandler (main.ts) supplies the
@@ -846,6 +990,19 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const restartRecording = async () => {
 		if (restarting.current) return;
 
+		if (nativeWindowsRecording.current) {
+			const activeRecordingId = recordingId.current;
+			restarting.current = true;
+			discardRecordingId.current = activeRecordingId;
+			try {
+				await finalizeNativeWindowsRecording(true);
+				await startRecording();
+			} finally {
+				restarting.current = false;
+			}
+			return;
+		}
+
 		const activeScreenRecorder = screenRecorder.current;
 		if (!activeScreenRecorder || activeScreenRecorder.recorder.state === "inactive") return;
 
@@ -903,6 +1060,14 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	}, [getRecordingDurationMs, paused, recording]);
 
 	const cancelRecording = () => {
+		if (nativeWindowsRecording.current) {
+			const activeRecordingId = recordingId.current;
+			discardRecordingId.current = activeRecordingId;
+			allowAutoFinalize.current = false;
+			void finalizeNativeWindowsRecording(true);
+			return;
+		}
+
 		const activeScreenRecorder = screenRecorder.current;
 		if (
 			activeScreenRecorder?.recorder.state === "recording" ||
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 3b62cb854..04ebccd64 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -54,8 +54,8 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 		imageDataUrl: arrowUrl,
 		width: 32,
 		height: 32,
-		hotspotX: 5.8,
-		hotspotY: 3.2,
+		hotspotX: 16.25,
+		hotspotY: 15.03,
 	},
 	text: {
 		imageDataUrl: textUrl,
@@ -67,9 +67,9 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 	pointer: {
 		imageDataUrl: pointerUrl,
 		width: 32,
-		height: 32,
-		hotspotX: 11.8,
-		hotspotY: 2.6,
+		height: 33,
+		hotspotX: 16.65,
+		hotspotY: 14.24,
 	},
 	crosshair: {
 		imageDataUrl: crosshairUrl,
@@ -131,15 +131,15 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 		imageDataUrl: appStartingUrl,
 		width: 32,
 		height: 32,
-		hotspotX: 5.8,
-		hotspotY: 3.2,
+		hotspotX: 7.25,
+		hotspotY: 4.03,
 	},
 	help: {
 		imageDataUrl: helpUrl,
 		width: 32,
 		height: 32,
-		hotspotX: 5.8,
-		hotspotY: 3.2,
+		hotspotX: 7.25,
+		hotspotY: 4.03,
 	},
 	"up-arrow": {
 		imageDataUrl: upArrowUrl,
diff --git a/src/lib/exporter/audioEncoder.ts b/src/lib/exporter/audioEncoder.ts
index 2391d083f..3237af265 100644
--- a/src/lib/exporter/audioEncoder.ts
+++ b/src/lib/exporter/audioEncoder.ts
@@ -3,6 +3,7 @@ import type { SpeedRegion, TrimRegion } from "@/components/video-editor/types";
 import type { VideoMuxer } from "./muxer";
 
 const AUDIO_BITRATE = 128_000;
+const EXPORT_AUDIO_CODEC = "mp4a.40.2";
 const DECODE_BACKPRESSURE_LIMIT = 20;
 const MIN_SPEED_REGION_DELTA_MS = 0.0001;
 const SEEK_TIMEOUT_MS = 5_000;
@@ -138,7 +139,7 @@ export class AudioProcessor {
 		const channels = audioConfig.numberOfChannels || 2;
 
 		const encodeConfig: AudioEncoderConfig = {
-			codec: "opus",
+			codec: EXPORT_AUDIO_CODEC,
 			sampleRate,
 			numberOfChannels: channels,
 			bitrate: AUDIO_BITRATE,
@@ -146,7 +147,7 @@ export class AudioProcessor {
 
 		const encodeSupport = await AudioEncoder.isConfigSupported(encodeConfig);
 		if (!encodeSupport.supported) {
-			console.warn("[AudioProcessor] Opus encoding not supported, skipping audio");
+			console.warn("[AudioProcessor] AAC encoding not supported, skipping audio");
 			for (const frame of decodedFrames) frame.close();
 			return;
 		}
@@ -397,28 +398,7 @@ export class AudioProcessor {
 
 		try {
 			await demuxer.load(file);
-			const audioConfig = await demuxer.getDecoderConfig("audio");
-			const reader = demuxer.read("audio").getReader();
-			let isFirstChunk = true;
-
-			try {
-				while (!this.cancelled) {
-					const { done, value: chunk } = await reader.read();
-					if (done || !chunk) break;
-					if (isFirstChunk) {
-						await muxer.addAudioChunk(chunk, { decoderConfig: audioConfig });
-						isFirstChunk = false;
-					} else {
-						await muxer.addAudioChunk(chunk);
-					}
-				}
-			} finally {
-				try {
-					await reader.cancel();
-				} catch {
-					/* reader already closed */
-				}
-			}
+			await this.processTrimOnlyAudio(demuxer, muxer, []);
 		} finally {
 			try {
 				demuxer.destroy();
diff --git a/src/lib/exporter/muxer.ts b/src/lib/exporter/muxer.ts
index a51123877..a2cc76d96 100644
--- a/src/lib/exporter/muxer.ts
+++ b/src/lib/exporter/muxer.ts
@@ -40,7 +40,7 @@ export class VideoMuxer {
 
 		// Create audio source if needed
 		if (this.hasAudio) {
-			this.audioSource = new EncodedAudioPacketSource("opus");
+			this.audioSource = new EncodedAudioPacketSource("aac");
 			this.output.addAudioTrack(this.audioSource);
 		}
 
diff --git a/src/lib/nativeWindowsRecording.ts b/src/lib/nativeWindowsRecording.ts
new file mode 100644
index 000000000..d30ef176e
--- /dev/null
+++ b/src/lib/nativeWindowsRecording.ts
@@ -0,0 +1,41 @@
+export type NativeWindowsSourceType = "display" | "window";
+
+export type NativeWindowsRecordingRequest = {
+	recordingId?: number;
+	source: {
+		type: NativeWindowsSourceType;
+		sourceId: string;
+		displayId?: number;
+		windowHandle?: string;
+	};
+	video: {
+		fps: number;
+		width: number;
+		height: number;
+	};
+	audio: {
+		system: {
+			enabled: boolean;
+		};
+		microphone: {
+			enabled: boolean;
+			deviceId?: string;
+			gain: number;
+		};
+	};
+	webcam: {
+		enabled: boolean;
+		deviceId?: string;
+		width: number;
+		height: number;
+		fps: number;
+	};
+};
+
+export type NativeWindowsRecordingStartResult = {
+	success: boolean;
+	recordingId?: number;
+	path?: string;
+	helperPath?: string;
+	error?: string;
+};

From 1b285c2426966557b1c3903224399787ae252399 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 16:19:34 +0200
Subject: [PATCH 12/38] feat: add native Windows microphone capture

---
 .../windows-native-recorder-roadmap.md        |   4 +
 electron/native/README.md                     |   6 +-
 electron/native/wgc-capture/CMakeLists.txt    |   2 +
 .../wgc-capture/src/audio_sample_utils.cpp    | 128 ++++++++++++++++++
 .../wgc-capture/src/audio_sample_utils.h      |  20 +++
 electron/native/wgc-capture/src/main.cpp      |  93 +++++++++++--
 .../src/wasapi_loopback_capture.cpp           |  33 ++++-
 .../wgc-capture/src/wasapi_loopback_capture.h |  10 +-
 package.json                                  |   2 +
 scripts/test-windows-wgc-helper.mjs           |  12 +-
 10 files changed, 290 insertions(+), 20 deletions(-)
 create mode 100644 electron/native/wgc-capture/src/audio_sample_utils.cpp
 create mode 100644 electron/native/wgc-capture/src/audio_sample_utils.h

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index c6a0a063c..2fb6ab504 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -138,6 +138,8 @@ SSOT rules for this phase:
 
 ### 3. WASAPI Microphone
 
+Status: initial implementation in progress. The helper can open the default WASAPI capture endpoint, apply the OpenScreen microphone gain, encode mic-only audio, and mix mic into system-loopback packets when both endpoints expose the same runtime format. Browser `deviceId` to MMDevice id mapping, resampling between mismatched endpoint formats, and drift correction remain follow-up hardening work.
+
 - Add microphone device enumeration and stable device-id mapping.
 - Capture selected/default microphone through WASAPI.
 - Apply OpenScreen's current mic gain policy.
@@ -192,6 +194,8 @@ Acceptance:
 - `npm run test:wgc-webcam:win`: validates webcam output when a webcam is available, otherwise skips explicitly.
 - Packaging check: confirms the helper is in `app.asar.unpacked`.
 - Export check: exported MP4s generated from native recordings keep an AAC audio track when the source has audio.
+- `npm run test:wgc-mic:win`: validates default-microphone capture writes an AAC track when an input endpoint is available.
+- `npm run test:wgc-mixed-audio:win`: validates system loopback plus microphone writes one mixed AAC track when endpoint formats are compatible.
 
 ## Ship Criteria
 
diff --git a/electron/native/README.md b/electron/native/README.md
index 512517bc4..5df7290b6 100644
--- a/electron/native/README.md
+++ b/electron/native/README.md
@@ -32,6 +32,8 @@ Current V2 JSON shape:
   "fps": 60,
   "captureSystemAudio": false,
   "captureMic": false,
+  "microphoneDeviceId": "default",
+  "microphoneGain": 1.4,
   "webcamEnabled": false,
   "outputs": {
     "screenPath": "C:\\path\\recording-123.mp4",
@@ -40,11 +42,13 @@ Current V2 JSON shape:
 }
 ```
 
-The current helper implementation supports display video capture and system audio loopback. Microphone, webcam, and window capture now fail explicitly in the helper rather than silently falling back to Electron capture on Windows. See `docs/engineering/windows-native-recorder-roadmap.md` for the phased implementation plan.
+The current helper implementation supports display video capture, system audio loopback, and initial default-microphone capture. Webcam and window capture now fail explicitly in the helper rather than silently falling back to Electron capture on Windows. See `docs/engineering/windows-native-recorder-roadmap.md` for the phased implementation plan.
 
 Smoke-test the helper with:
 
 ```powershell
 npm run test:wgc-helper:win
 npm run test:wgc-audio:win
+npm run test:wgc-mic:win
+npm run test:wgc-mixed-audio:win
 ```
diff --git a/electron/native/wgc-capture/CMakeLists.txt b/electron/native/wgc-capture/CMakeLists.txt
index 76999f707..b21fd66de 100644
--- a/electron/native/wgc-capture/CMakeLists.txt
+++ b/electron/native/wgc-capture/CMakeLists.txt
@@ -14,6 +14,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 add_executable(wgc-capture
+  src/audio_sample_utils.cpp
+  src/audio_sample_utils.h
   src/main.cpp
   src/mf_encoder.cpp
   src/mf_encoder.h
diff --git a/electron/native/wgc-capture/src/audio_sample_utils.cpp b/electron/native/wgc-capture/src/audio_sample_utils.cpp
new file mode 100644
index 000000000..6537d8e46
--- /dev/null
+++ b/electron/native/wgc-capture/src/audio_sample_utils.cpp
@@ -0,0 +1,128 @@
+#include "audio_sample_utils.h"
+
+#include <mfapi.h>
+
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <limits>
+
+namespace {
+
+bool isFloatFormat(const AudioInputFormat& format) {
+    return format.subtype == MFAudioFormat_Float && format.bitsPerSample == 32;
+}
+
+bool isPcmFormat(const AudioInputFormat& format, UINT32 bitsPerSample) {
+    return format.subtype == MFAudioFormat_PCM && format.bitsPerSample == bitsPerSample;
+}
+
+template <typename T>
+T clampTo(double value) {
+    const double minValue = static_cast<double>(std::numeric_limits<T>::min());
+    const double maxValue = static_cast<double>(std::numeric_limits<T>::max());
+    return static_cast<T>(std::clamp(std::round(value), minValue, maxValue));
+}
+
+} // namespace
+
+bool sameAudioFormatForMixing(const AudioInputFormat& left, const AudioInputFormat& right) {
+    return left.subtype == right.subtype &&
+           left.sampleRate == right.sampleRate &&
+           left.channels == right.channels &&
+           left.bitsPerSample == right.bitsPerSample &&
+           left.blockAlign == right.blockAlign &&
+           left.avgBytesPerSec == right.avgBytesPerSec;
+}
+
+void copyAudioWithGain(
+    const BYTE* source,
+    DWORD byteCount,
+    const AudioInputFormat& format,
+    double gain,
+    std::vector<BYTE>& destination) {
+    destination.resize(byteCount);
+    if (!source || byteCount == 0) {
+        return;
+    }
+
+    if (std::abs(gain - 1.0) < 0.0001) {
+        std::memcpy(destination.data(), source, byteCount);
+        return;
+    }
+
+    if (isFloatFormat(format)) {
+        const auto* input = reinterpret_cast<const float*>(source);
+        auto* output = reinterpret_cast<float*>(destination.data());
+        const size_t sampleCount = byteCount / sizeof(float);
+        for (size_t index = 0; index < sampleCount; index += 1) {
+            output[index] = static_cast<float>(std::clamp(input[index] * gain, -1.0, 1.0));
+        }
+        return;
+    }
+
+    if (isPcmFormat(format, 16)) {
+        const auto* input = reinterpret_cast<const int16_t*>(source);
+        auto* output = reinterpret_cast<int16_t*>(destination.data());
+        const size_t sampleCount = byteCount / sizeof(int16_t);
+        for (size_t index = 0; index < sampleCount; index += 1) {
+            output[index] = clampTo<int16_t>(static_cast<double>(input[index]) * gain);
+        }
+        return;
+    }
+
+    if (isPcmFormat(format, 32)) {
+        const auto* input = reinterpret_cast<const int32_t*>(source);
+        auto* output = reinterpret_cast<int32_t*>(destination.data());
+        const size_t sampleCount = byteCount / sizeof(int32_t);
+        for (size_t index = 0; index < sampleCount; index += 1) {
+            output[index] = clampTo<int32_t>(static_cast<double>(input[index]) * gain);
+        }
+        return;
+    }
+
+    std::memcpy(destination.data(), source, byteCount);
+}
+
+void mixAudioInPlace(
+    std::vector<BYTE>& destination,
+    const BYTE* source,
+    DWORD byteCount,
+    const AudioInputFormat& format) {
+    if (!source || byteCount == 0 || destination.empty()) {
+        return;
+    }
+
+    const size_t mixByteCount = std::min(destination.size(), static_cast<size_t>(byteCount));
+
+    if (isFloatFormat(format)) {
+        auto* output = reinterpret_cast<float*>(destination.data());
+        const auto* input = reinterpret_cast<const float*>(source);
+        const size_t sampleCount = mixByteCount / sizeof(float);
+        for (size_t index = 0; index < sampleCount; index += 1) {
+            output[index] = static_cast<float>(std::clamp(output[index] + input[index], -1.0f, 1.0f));
+        }
+        return;
+    }
+
+    if (isPcmFormat(format, 16)) {
+        auto* output = reinterpret_cast<int16_t*>(destination.data());
+        const auto* input = reinterpret_cast<const int16_t*>(source);
+        const size_t sampleCount = mixByteCount / sizeof(int16_t);
+        for (size_t index = 0; index < sampleCount; index += 1) {
+            output[index] = clampTo<int16_t>(
+                static_cast<double>(output[index]) + static_cast<double>(input[index]));
+        }
+        return;
+    }
+
+    if (isPcmFormat(format, 32)) {
+        auto* output = reinterpret_cast<int32_t*>(destination.data());
+        const auto* input = reinterpret_cast<const int32_t*>(source);
+        const size_t sampleCount = mixByteCount / sizeof(int32_t);
+        for (size_t index = 0; index < sampleCount; index += 1) {
+            output[index] = clampTo<int32_t>(
+                static_cast<double>(output[index]) + static_cast<double>(input[index]));
+        }
+    }
+}
diff --git a/electron/native/wgc-capture/src/audio_sample_utils.h b/electron/native/wgc-capture/src/audio_sample_utils.h
new file mode 100644
index 000000000..8022ae33d
--- /dev/null
+++ b/electron/native/wgc-capture/src/audio_sample_utils.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mf_encoder.h"
+
+#include <Windows.h>
+
+#include <vector>
+
+bool sameAudioFormatForMixing(const AudioInputFormat& left, const AudioInputFormat& right);
+void copyAudioWithGain(
+    const BYTE* source,
+    DWORD byteCount,
+    const AudioInputFormat& format,
+    double gain,
+    std::vector<BYTE>& destination);
+void mixAudioInPlace(
+    std::vector<BYTE>& destination,
+    const BYTE* source,
+    DWORD byteCount,
+    const AudioInputFormat& format);
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 39d5c62e1..603fda36f 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -1,3 +1,4 @@
+#include "audio_sample_utils.h"
 #include "mf_encoder.h"
 #include "monitor_utils.h"
 #include "wasapi_loopback_capture.h"
@@ -273,11 +274,6 @@ int main(int argc, char* argv[]) {
         return 1;
     }
 
-    if (config.captureMic) {
-        std::cerr << "ERROR: Microphone capture is not implemented in this helper yet" << std::endl;
-        return 1;
-    }
-
     if (config.webcamEnabled) {
         std::cerr << "ERROR: Native webcam capture is not implemented in this helper yet" << std::endl;
         return 1;
@@ -309,16 +305,34 @@ int main(int argc, char* argv[]) {
     const int bitrate = pixels >= 3840 * 2160 ? 45'000'000 : pixels >= 2560 * 1440 ? 28'000'000 : 18'000'000;
 
     WasapiLoopbackCapture loopbackCapture;
+    WasapiLoopbackCapture microphoneCapture;
     const AudioInputFormat* audioFormat = nullptr;
     if (config.captureSystemAudio) {
-        if (!loopbackCapture.initialize()) {
+        if (!loopbackCapture.initializeSystemLoopback()) {
             std::cerr << "ERROR: Failed to initialize WASAPI loopback capture" << std::endl;
             return 1;
         }
         audioFormat = &loopbackCapture.inputFormat();
-        std::cout << "{\"event\":\"audio-format\",\"schemaVersion\":2,\"sampleRate\":"
-                  << audioFormat->sampleRate << ",\"channels\":" << audioFormat->channels
-                  << ",\"bitsPerSample\":" << audioFormat->bitsPerSample << "}" << std::endl;
+    }
+    if (config.captureMic) {
+        if (!microphoneCapture.initializeMicrophone(utf8ToWide(config.microphoneDeviceId))) {
+            std::cerr << "ERROR: Failed to initialize WASAPI microphone capture" << std::endl;
+            return 1;
+        }
+        if (!audioFormat) {
+            audioFormat = &microphoneCapture.inputFormat();
+        } else if (!sameAudioFormatForMixing(*audioFormat, microphoneCapture.inputFormat())) {
+            std::cerr << "ERROR: System audio and microphone formats differ; native mixing is not supported yet"
+                      << std::endl;
+            return 1;
+        }
+    }
+    if (audioFormat) {
+        std::cout << "{\"event\":\"audio-format\",\"schemaVersion\":2,\"sampleRate\":" << audioFormat->sampleRate
+                  << ",\"channels\":" << audioFormat->channels
+                  << ",\"bitsPerSample\":" << audioFormat->bitsPerSample
+                  << ",\"system\":" << (config.captureSystemAudio ? "true" : "false")
+                  << ",\"microphone\":" << (config.captureMic ? "true" : "false") << "}" << std::endl;
     }
 
     MFEncoder encoder;
@@ -358,24 +372,81 @@ int main(int argc, char* argv[]) {
         }
     });
 
+    std::mutex microphoneAudioMutex;
+    std::vector<BYTE> latestMicrophoneAudio;
+    std::vector<BYTE> mixedAudioBuffer;
+    std::vector<BYTE> microphoneGainBuffer;
+
+    if (config.captureMic) {
+        if (!microphoneCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
+                if (stopRequested || !audioFormat) {
+                    return;
+                }
+
+                copyAudioWithGain(
+                    data,
+                    byteCount,
+                    microphoneCapture.inputFormat(),
+                    config.microphoneGain,
+                    microphoneGainBuffer);
+
+                if (config.captureSystemAudio) {
+                    std::scoped_lock lock(microphoneAudioMutex);
+                    latestMicrophoneAudio = microphoneGainBuffer;
+                    return;
+                }
+
+                if (!encoder.writeAudio(
+                        microphoneGainBuffer.data(),
+                        static_cast<DWORD>(microphoneGainBuffer.size()),
+                        timestampHns,
+                        durationHns)) {
+                    encodeFailed = true;
+                    stopRequested = true;
+                    cv.notify_all();
+                }
+            })) {
+            std::cerr << "ERROR: Failed to start WASAPI microphone capture" << std::endl;
+            return 1;
+        }
+    }
+
     if (config.captureSystemAudio) {
         if (!loopbackCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
                 if (stopRequested) {
                     return;
                 }
 
-                if (!encoder.writeAudio(data, byteCount, timestampHns, durationHns)) {
+                const BYTE* encodedData = data;
+                DWORD encodedByteCount = byteCount;
+                if (config.captureMic && audioFormat) {
+                    mixedAudioBuffer.assign(data, data + byteCount);
+                    {
+                        std::scoped_lock lock(microphoneAudioMutex);
+                        mixAudioInPlace(
+                            mixedAudioBuffer,
+                            latestMicrophoneAudio.data(),
+                            static_cast<DWORD>(latestMicrophoneAudio.size()),
+                            *audioFormat);
+                    }
+                    encodedData = mixedAudioBuffer.data();
+                    encodedByteCount = static_cast<DWORD>(mixedAudioBuffer.size());
+                }
+
+                if (!encoder.writeAudio(encodedData, encodedByteCount, timestampHns, durationHns)) {
                     encodeFailed = true;
                     stopRequested = true;
                     cv.notify_all();
                 }
             })) {
             std::cerr << "ERROR: Failed to start WASAPI loopback capture" << std::endl;
+            microphoneCapture.stop();
             return 1;
         }
     }
 
     if (!session.start()) {
+        microphoneCapture.stop();
         loopbackCapture.stop();
         std::cerr << "ERROR: Failed to start WGC session" << std::endl;
         return 1;
@@ -394,6 +465,7 @@ int main(int argc, char* argv[]) {
             if (stdinThread.joinable()) {
                 stdinThread.detach();
             }
+            microphoneCapture.stop();
             loopbackCapture.stop();
             std::cerr << "ERROR: Timed out waiting for first WGC frame" << std::endl;
             return 1;
@@ -410,6 +482,7 @@ int main(int argc, char* argv[]) {
         });
     }
 
+    microphoneCapture.stop();
     loopbackCapture.stop();
     session.stop();
     {
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
index e4f254e66..4e350a24c 100644
--- a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
@@ -51,7 +51,15 @@ WasapiLoopbackCapture::~WasapiLoopbackCapture() {
     }
 }
 
-bool WasapiLoopbackCapture::initialize() {
+bool WasapiLoopbackCapture::initializeSystemLoopback() {
+    return initialize(WasapiCaptureEndpoint::SystemLoopback, {});
+}
+
+bool WasapiLoopbackCapture::initializeMicrophone(const std::wstring& deviceId) {
+    return initialize(WasapiCaptureEndpoint::Microphone, deviceId);
+}
+
+bool WasapiLoopbackCapture::initialize(WasapiCaptureEndpoint endpoint, const std::wstring& deviceId) {
     HRESULT hr = CoCreateInstance(
         __uuidof(MMDeviceEnumerator),
         nullptr,
@@ -61,9 +69,22 @@ bool WasapiLoopbackCapture::initialize() {
         return false;
     }
 
-    hr = deviceEnumerator_->GetDefaultAudioEndpoint(eRender, eConsole, &device_);
-    if (!succeeded(hr, "GetDefaultAudioEndpoint(render)")) {
-        return false;
+    if (endpoint == WasapiCaptureEndpoint::Microphone && !deviceId.empty() && deviceId != L"default") {
+        hr = deviceEnumerator_->GetDevice(deviceId.c_str(), &device_);
+        if (FAILED(hr)) {
+            std::wcerr << L"WARNING: Could not resolve microphone device id; using default capture endpoint"
+                       << std::endl;
+            device_.Reset();
+        }
+    }
+
+    if (!device_) {
+        const EDataFlow flow =
+            endpoint == WasapiCaptureEndpoint::SystemLoopback ? eRender : eCapture;
+        hr = deviceEnumerator_->GetDefaultAudioEndpoint(flow, eConsole, &device_);
+        if (!succeeded(hr, "GetDefaultAudioEndpoint")) {
+            return false;
+        }
     }
 
     hr = device_->Activate(__uuidof(IAudioClient), CLSCTX_ALL, nullptr, &audioClient_);
@@ -81,9 +102,11 @@ bool WasapiLoopbackCapture::initialize() {
         return false;
     }
 
+    const DWORD streamFlags =
+        endpoint == WasapiCaptureEndpoint::SystemLoopback ? AUDCLNT_STREAMFLAGS_LOOPBACK : 0;
     hr = audioClient_->Initialize(
         AUDCLNT_SHAREMODE_SHARED,
-        AUDCLNT_STREAMFLAGS_LOOPBACK,
+        streamFlags,
         BufferDurationHns,
         0,
         mixFormat_,
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.h b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
index e6fb7e8b0..8d2dbb940 100644
--- a/electron/native/wgc-capture/src/wasapi_loopback_capture.h
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
@@ -10,9 +10,15 @@
 #include <atomic>
 #include <cstdint>
 #include <functional>
+#include <string>
 #include <thread>
 #include <vector>
 
+enum class WasapiCaptureEndpoint {
+    SystemLoopback,
+    Microphone,
+};
+
 class WasapiLoopbackCapture {
 public:
     using AudioCallback = std::function<void(const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns)>;
@@ -23,13 +29,15 @@ class WasapiLoopbackCapture {
     WasapiLoopbackCapture(const WasapiLoopbackCapture&) = delete;
     WasapiLoopbackCapture& operator=(const WasapiLoopbackCapture&) = delete;
 
-    bool initialize();
+    bool initializeSystemLoopback();
+    bool initializeMicrophone(const std::wstring& deviceId);
     bool start(AudioCallback callback);
     void stop();
 
     const AudioInputFormat& inputFormat() const;
 
 private:
+    bool initialize(WasapiCaptureEndpoint endpoint, const std::wstring& deviceId);
     void captureLoop();
     bool resolveInputFormat(WAVEFORMATEX* mixFormat);
 
diff --git a/package.json b/package.json
index d5bb922e5..16db3c908 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,8 @@
 		"test:cursor-native:win": "node scripts/test-windows-native-cursor.mjs",
 		"test:wgc-helper:win": "node scripts/test-windows-wgc-helper.mjs",
 		"test:wgc-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio",
+		"test:wgc-mic:win": "node scripts/test-windows-wgc-helper.mjs --microphone",
+		"test:wgc-mixed-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio --microphone",
 		"capture:openscreen-preview": "node scripts/capture-openscreen-preview.mjs",
 		"build-vite": "tsc && vite build",
 		"test:browser": "vitest --config vitest.browser.config.ts --run",
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index 627c0cab8..45dab7d90 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -14,6 +14,10 @@ const DURATION_MS = Number(process.env.OPENSCREEN_WGC_TEST_DURATION_MS ?? 5000);
 const WITH_SYSTEM_AUDIO =
 	process.env.OPENSCREEN_WGC_TEST_SYSTEM_AUDIO === "true" ||
 	process.argv.includes("--system-audio");
+const WITH_MICROPHONE =
+	process.env.OPENSCREEN_WGC_TEST_MICROPHONE === "true" ||
+	process.argv.includes("--microphone") ||
+	process.argv.includes("--mic");
 
 function runHelper(config) {
 	return new Promise((resolve, reject) => {
@@ -101,7 +105,7 @@ if (!fs.existsSync(HELPER_PATH)) {
 
 const outputPath = path.join(
 	os.tmpdir(),
-	`openscreen-wgc-helper-${WITH_SYSTEM_AUDIO ? "audio" : "video"}-${Date.now()}.mp4`,
+	`openscreen-wgc-helper-${WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${Date.now()}.mp4`,
 );
 
 const config = {
@@ -120,7 +124,9 @@ const config = {
 	displayH: 1080,
 	hasDisplayBounds: true,
 	captureSystemAudio: WITH_SYSTEM_AUDIO,
-	captureMic: false,
+	captureMic: WITH_MICROPHONE,
+	microphoneDeviceId: "default",
+	microphoneGain: 1.4,
 	webcamEnabled: false,
 	outputs: { screenPath: outputPath },
 };
@@ -139,7 +145,7 @@ const hasAudio = streams.some((stream) => stream.codec_type === "audio");
 if (!hasVideo) {
 	throw new Error(`WGC helper output has no video stream: ${outputPath}`);
 }
-if (WITH_SYSTEM_AUDIO && !hasAudio) {
+if ((WITH_SYSTEM_AUDIO || WITH_MICROPHONE) && !hasAudio) {
 	throw new Error(`WGC helper output has no audio stream: ${outputPath}`);
 }
 const frameLuma = measureFirstFrameLuma(outputPath);

From 793380a4ef00022af8c31fe86ec222a6eff8cb7e Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 16:49:07 +0200
Subject: [PATCH 13/38] fix: align native mixed audio timeline

---
 .../windows-native-recorder-roadmap.md        |   2 +-
 .../wgc-capture/src/audio_sample_utils.cpp    | 163 ++++++++++++++++++
 .../wgc-capture/src/audio_sample_utils.h      |  48 ++++++
 electron/native/wgc-capture/src/main.cpp      | 128 +++++++-------
 scripts/test-windows-wgc-helper.mjs           |   3 +-
 5 files changed, 282 insertions(+), 62 deletions(-)

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index 2fb6ab504..12c6d49f2 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -138,7 +138,7 @@ SSOT rules for this phase:
 
 ### 3. WASAPI Microphone
 
-Status: initial implementation in progress. The helper can open the default WASAPI capture endpoint, apply the OpenScreen microphone gain, encode mic-only audio, and mix mic into system-loopback packets when both endpoints expose the same runtime format. Browser `deviceId` to MMDevice id mapping, resampling between mismatched endpoint formats, and drift correction remain follow-up hardening work.
+Status: initial implementation in progress. The helper can open the default WASAPI capture endpoint, apply the OpenScreen microphone gain, encode mic-only audio, and mix system loopback plus microphone through a single queued `AudioMixer` timeline when both endpoints expose the same runtime format. Audio endpoints are warmed before WGC starts, the mixer drops pre-roll and begins its paced timeline on the first encoded video frame, then cuts queued tail audio on stop so the MP4 does not drift past the video. Browser `deviceId` to MMDevice id mapping, resampling between mismatched endpoint formats, and drift correction remain follow-up hardening work.
 
 - Add microphone device enumeration and stable device-id mapping.
 - Capture selected/default microphone through WASAPI.
diff --git a/electron/native/wgc-capture/src/audio_sample_utils.cpp b/electron/native/wgc-capture/src/audio_sample_utils.cpp
index 6537d8e46..1e5e1bbc6 100644
--- a/electron/native/wgc-capture/src/audio_sample_utils.cpp
+++ b/electron/native/wgc-capture/src/audio_sample_utils.cpp
@@ -3,6 +3,7 @@
 #include <mfapi.h>
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstring>
 #include <limits>
@@ -26,6 +27,8 @@ T clampTo(double value) {
 
 } // namespace
 
+constexpr int64_t HnsPerSecond = 10'000'000;
+
 bool sameAudioFormatForMixing(const AudioInputFormat& left, const AudioInputFormat& right) {
     return left.subtype == right.subtype &&
            left.sampleRate == right.sampleRate &&
@@ -43,6 +46,7 @@ void copyAudioWithGain(
     std::vector<BYTE>& destination) {
     destination.resize(byteCount);
     if (!source || byteCount == 0) {
+        std::fill(destination.begin(), destination.end(), static_cast<BYTE>(0));
         return;
     }
 
@@ -126,3 +130,162 @@ void mixAudioInPlace(
         }
     }
 }
+
+AudioMixer::AudioMixer(
+    const AudioInputFormat& format,
+    bool includeSystem,
+    bool includeMicrophone,
+    double microphoneGain,
+    OutputCallback output)
+    : format_(format),
+      includeSystem_(includeSystem),
+      includeMicrophone_(includeMicrophone),
+      microphoneGain_(microphoneGain),
+      output_(std::move(output)) {}
+
+AudioMixer::~AudioMixer() {
+    stop();
+}
+
+bool AudioMixer::start() {
+    if (!output_ || format_.sampleRate == 0 || format_.blockAlign == 0) {
+        return false;
+    }
+
+    stopRequested_ = false;
+    emittedFrames_ = 0;
+    timelineStarted_ = false;
+    thread_ = std::thread([this] {
+        mixLoop();
+    });
+    return true;
+}
+
+void AudioMixer::beginTimeline() {
+    {
+        std::scoped_lock lock(mutex_);
+        systemQueue_.clear();
+        microphoneQueue_.clear();
+        emittedFrames_ = 0;
+        timelineStarted_ = true;
+    }
+    cv_.notify_all();
+}
+
+void AudioMixer::stop() {
+    stopRequested_ = true;
+    cv_.notify_all();
+    if (thread_.joinable()) {
+        thread_.join();
+    }
+}
+
+void AudioMixer::pushSystem(const BYTE* data, DWORD byteCount) {
+    if (!includeSystem_ || stopRequested_) {
+        return;
+    }
+
+    {
+        std::scoped_lock lock(mutex_);
+        append(systemQueue_, data, byteCount, 1.0);
+    }
+    cv_.notify_all();
+}
+
+void AudioMixer::pushMicrophone(const BYTE* data, DWORD byteCount) {
+    if (!includeMicrophone_ || stopRequested_) {
+        return;
+    }
+
+    {
+        std::scoped_lock lock(mutex_);
+        append(microphoneQueue_, data, byteCount, microphoneGain_);
+    }
+    cv_.notify_all();
+}
+
+void AudioMixer::append(std::vector<BYTE>& queue, const BYTE* data, DWORD byteCount, double gain) {
+    if (!data || byteCount == 0) {
+        return;
+    }
+
+    copyAudioWithGain(data, byteCount, format_, gain, gainBuffer_);
+    queue.insert(queue.end(), gainBuffer_.begin(), gainBuffer_.end());
+}
+
+bool AudioMixer::pop(std::vector<BYTE>& queue, std::vector<BYTE>& chunk, size_t byteCount) {
+    if (queue.empty()) {
+        chunk.assign(byteCount, 0);
+        return false;
+    }
+
+    chunk.assign(byteCount, 0);
+    const size_t copiedBytes = std::min(byteCount, queue.size());
+    std::memcpy(chunk.data(), queue.data(), copiedBytes);
+    queue.erase(queue.begin(), queue.begin() + static_cast<std::ptrdiff_t>(copiedBytes));
+    return copiedBytes > 0;
+}
+
+void AudioMixer::mixLoop() {
+    const uint32_t chunkFrames = std::max<uint32_t>(1, format_.sampleRate / 100);
+    const size_t chunkBytes = static_cast<size_t>(chunkFrames) * format_.blockAlign;
+    std::vector<BYTE> mixedChunk;
+    std::vector<BYTE> sourceChunk;
+    std::chrono::steady_clock::time_point audioClockStart;
+    bool audioClockStarted = false;
+
+    while (true) {
+        {
+            std::unique_lock lock(mutex_);
+            cv_.wait_for(lock, std::chrono::milliseconds(20), [&] {
+                const bool hasSystem = !includeSystem_ || systemQueue_.size() >= chunkBytes;
+                const bool hasMicrophone = !includeMicrophone_ || microphoneQueue_.size() >= chunkBytes;
+                const bool hasAnySource = !systemQueue_.empty() || !microphoneQueue_.empty();
+                return stopRequested_.load() ||
+                    (timelineStarted_ && (hasSystem || hasMicrophone) && hasAnySource);
+            });
+
+            if (stopRequested_) {
+                break;
+            }
+            if (!timelineStarted_) {
+                continue;
+            }
+
+            const bool hasAnyQueuedAudio = !systemQueue_.empty() || !microphoneQueue_.empty();
+            if (!hasAnyQueuedAudio) {
+                continue;
+            }
+
+            mixedChunk.assign(chunkBytes, 0);
+            if (includeSystem_) {
+                pop(systemQueue_, sourceChunk, chunkBytes);
+                mixAudioInPlace(mixedChunk, sourceChunk.data(), static_cast<DWORD>(sourceChunk.size()), format_);
+            }
+            if (includeMicrophone_) {
+                pop(microphoneQueue_, sourceChunk, chunkBytes);
+                mixAudioInPlace(mixedChunk, sourceChunk.data(), static_cast<DWORD>(sourceChunk.size()), format_);
+            }
+        }
+
+        if (!audioClockStarted) {
+            audioClockStart = std::chrono::steady_clock::now();
+            audioClockStarted = true;
+        }
+
+        const int64_t timestampHns =
+            static_cast<int64_t>((emittedFrames_ * HnsPerSecond) / format_.sampleRate);
+        const int64_t durationHns =
+            static_cast<int64_t>((static_cast<uint64_t>(chunkFrames) * HnsPerSecond) / format_.sampleRate);
+        if (!output_(mixedChunk.data(), static_cast<DWORD>(mixedChunk.size()), timestampHns, durationHns)) {
+            stopRequested_ = true;
+            break;
+        }
+        emittedFrames_ += chunkFrames;
+
+        const auto nextDeadline = audioClockStart +
+            std::chrono::duration_cast<std::chrono::steady_clock::duration>(
+                std::chrono::duration<double>(static_cast<double>(emittedFrames_) / format_.sampleRate));
+        std::this_thread::sleep_until(nextDeadline);
+    }
+}
diff --git a/electron/native/wgc-capture/src/audio_sample_utils.h b/electron/native/wgc-capture/src/audio_sample_utils.h
index 8022ae33d..b2b682137 100644
--- a/electron/native/wgc-capture/src/audio_sample_utils.h
+++ b/electron/native/wgc-capture/src/audio_sample_utils.h
@@ -4,6 +4,12 @@
 
 #include <Windows.h>
 
+#include <atomic>
+#include <condition_variable>
+#include <cstdint>
+#include <functional>
+#include <mutex>
+#include <thread>
 #include <vector>
 
 bool sameAudioFormatForMixing(const AudioInputFormat& left, const AudioInputFormat& right);
@@ -18,3 +24,45 @@ void mixAudioInPlace(
     const BYTE* source,
     DWORD byteCount,
     const AudioInputFormat& format);
+
+class AudioMixer {
+public:
+    using OutputCallback = std::function<bool(const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns)>;
+
+    AudioMixer(
+        const AudioInputFormat& format,
+        bool includeSystem,
+        bool includeMicrophone,
+        double microphoneGain,
+        OutputCallback output);
+    ~AudioMixer();
+
+    AudioMixer(const AudioMixer&) = delete;
+    AudioMixer& operator=(const AudioMixer&) = delete;
+
+    bool start();
+    void beginTimeline();
+    void stop();
+    void pushSystem(const BYTE* data, DWORD byteCount);
+    void pushMicrophone(const BYTE* data, DWORD byteCount);
+
+private:
+    void append(std::vector<BYTE>& queue, const BYTE* data, DWORD byteCount, double gain);
+    bool pop(std::vector<BYTE>& queue, std::vector<BYTE>& chunk, size_t byteCount);
+    void mixLoop();
+
+    AudioInputFormat format_{};
+    bool includeSystem_ = false;
+    bool includeMicrophone_ = false;
+    double microphoneGain_ = 1.0;
+    OutputCallback output_;
+    std::mutex mutex_;
+    std::condition_variable cv_;
+    std::vector<BYTE> systemQueue_;
+    std::vector<BYTE> microphoneQueue_;
+    std::vector<BYTE> gainBuffer_;
+    std::thread thread_;
+    std::atomic<bool> stopRequested_ = false;
+    bool timelineStarted_ = false;
+    uint64_t emittedFrames_ = 0;
+};
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 603fda36f..50e55efb8 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -13,6 +13,7 @@
 #include <cctype>
 #include <cstdint>
 #include <iostream>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
@@ -372,82 +373,78 @@ int main(int argc, char* argv[]) {
         }
     });
 
-    std::mutex microphoneAudioMutex;
-    std::vector<BYTE> latestMicrophoneAudio;
-    std::vector<BYTE> mixedAudioBuffer;
-    std::vector<BYTE> microphoneGainBuffer;
-
-    if (config.captureMic) {
-        if (!microphoneCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
-                if (stopRequested || !audioFormat) {
-                    return;
-                }
-
-                copyAudioWithGain(
-                    data,
-                    byteCount,
-                    microphoneCapture.inputFormat(),
-                    config.microphoneGain,
-                    microphoneGainBuffer);
-
-                if (config.captureSystemAudio) {
-                    std::scoped_lock lock(microphoneAudioMutex);
-                    latestMicrophoneAudio = microphoneGainBuffer;
-                    return;
-                }
+    std::unique_ptr<AudioMixer> audioMixer;
+    auto startAudioCaptures = [&]() -> bool {
+        if (!audioFormat) {
+            return true;
+        }
 
-                if (!encoder.writeAudio(
-                        microphoneGainBuffer.data(),
-                        static_cast<DWORD>(microphoneGainBuffer.size()),
-                        timestampHns,
-                        durationHns)) {
+        audioMixer = std::make_unique<AudioMixer>(
+            *audioFormat,
+            config.captureSystemAudio,
+            config.captureMic,
+            config.microphoneGain,
+            [&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
+                if (!encoder.writeAudio(data, byteCount, timestampHns, durationHns)) {
                     encodeFailed = true;
                     stopRequested = true;
                     cv.notify_all();
+                    return false;
                 }
-            })) {
-            std::cerr << "ERROR: Failed to start WASAPI microphone capture" << std::endl;
-            return 1;
+                return true;
+            });
+
+        if (!audioMixer->start()) {
+            std::cerr << "ERROR: Failed to start native audio mixer" << std::endl;
+            return false;
         }
-    }
 
-    if (config.captureSystemAudio) {
-        if (!loopbackCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
-                if (stopRequested) {
-                    return;
-                }
+        if (config.captureMic) {
+            if (!microphoneCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
+                    (void)timestampHns;
+                    (void)durationHns;
+                    if (stopRequested || !audioMixer) {
+                        return;
+                    }
 
-                const BYTE* encodedData = data;
-                DWORD encodedByteCount = byteCount;
-                if (config.captureMic && audioFormat) {
-                    mixedAudioBuffer.assign(data, data + byteCount);
-                    {
-                        std::scoped_lock lock(microphoneAudioMutex);
-                        mixAudioInPlace(
-                            mixedAudioBuffer,
-                            latestMicrophoneAudio.data(),
-                            static_cast<DWORD>(latestMicrophoneAudio.size()),
-                            *audioFormat);
+                    audioMixer->pushMicrophone(data, byteCount);
+                })) {
+                std::cerr << "ERROR: Failed to start WASAPI microphone capture" << std::endl;
+                audioMixer->stop();
+                return false;
+            }
+        }
+
+        if (config.captureSystemAudio) {
+            if (!loopbackCapture.start([&](const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns) {
+                    (void)timestampHns;
+                    (void)durationHns;
+                    if (stopRequested || !audioMixer) {
+                        return;
                     }
-                    encodedData = mixedAudioBuffer.data();
-                    encodedByteCount = static_cast<DWORD>(mixedAudioBuffer.size());
-                }
 
-                if (!encoder.writeAudio(encodedData, encodedByteCount, timestampHns, durationHns)) {
-                    encodeFailed = true;
-                    stopRequested = true;
-                    cv.notify_all();
-                }
-            })) {
-            std::cerr << "ERROR: Failed to start WASAPI loopback capture" << std::endl;
-            microphoneCapture.stop();
-            return 1;
+                    audioMixer->pushSystem(data, byteCount);
+                })) {
+                std::cerr << "ERROR: Failed to start WASAPI loopback capture" << std::endl;
+                microphoneCapture.stop();
+                audioMixer->stop();
+                return false;
+            }
         }
+
+        return true;
+    };
+
+    if (!startAudioCaptures()) {
+        return 1;
     }
 
     if (!session.start()) {
         microphoneCapture.stop();
         loopbackCapture.stop();
+        if (audioMixer) {
+            audioMixer->stop();
+        }
         std::cerr << "ERROR: Failed to start WGC session" << std::endl;
         return 1;
     }
@@ -467,11 +464,19 @@ int main(int argc, char* argv[]) {
             }
             microphoneCapture.stop();
             loopbackCapture.stop();
+            if (audioMixer) {
+                audioMixer->stop();
+            }
+            session.stop();
             std::cerr << "ERROR: Timed out waiting for first WGC frame" << std::endl;
             return 1;
         }
     }
 
+    if (audioMixer) {
+        audioMixer->beginTimeline();
+    }
+
     std::cout << "{\"event\":\"recording-started\",\"schemaVersion\":2}" << std::endl;
     std::cout << "Recording started" << std::endl;
 
@@ -484,6 +489,9 @@ int main(int argc, char* argv[]) {
 
     microphoneCapture.stop();
     loopbackCapture.stop();
+    if (audioMixer) {
+        audioMixer->stop();
+    }
     session.stop();
     {
         std::scoped_lock lock(mutex);
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index 45dab7d90..bb6981928 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -1,4 +1,5 @@
 import { spawn, spawnSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -105,7 +106,7 @@ if (!fs.existsSync(HELPER_PATH)) {
 
 const outputPath = path.join(
 	os.tmpdir(),
-	`openscreen-wgc-helper-${WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${Date.now()}.mp4`,
+	`openscreen-wgc-helper-${WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${process.pid}-${Date.now()}-${randomUUID()}.mp4`,
 );
 
 const config = {

From c7c4fea51e3186eb487402f5ae8c259bdddc229a Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 17:23:49 +0200
Subject: [PATCH 14/38] feat: add native Windows window capture

---
 .../windows-native-recorder-roadmap.md        |   2 +
 .../windowsNativeRecordingSession.script.ts   |  13 --
 .../windowsNativeRecordingSession.ts          |   6 +-
 electron/native/README.md                     |   4 +-
 electron/native/wgc-capture/src/main.cpp      | 132 +++++++++++++++---
 .../native/wgc-capture/src/wgc_session.cpp    |  59 ++++++++
 electron/native/wgc-capture/src/wgc_session.h |   2 +
 package.json                                  |   1 +
 scripts/test-windows-wgc-helper.mjs           |  64 ++++++++-
 src/hooks/useScreenRecorder.ts                |   7 +-
 src/lib/nativeWindowsRecording.ts             |  13 ++
 11 files changed, 259 insertions(+), 44 deletions(-)

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index 12c6d49f2..ac309f919 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -165,6 +165,8 @@ Acceptance:
 
 ### 5. Native Window Capture
 
+Status: initial implementation in progress. Electron parses the `window:<HWND>:...` desktop source id through the shared native Windows recording contract and passes `windowHandle` to the helper. The helper resolves the `HWND`, validates it with `IsWindow`, and creates the WGC item with `CreateForWindow(HWND)`. Resize/minimize/move hardening and protected-window diagnostics remain follow-up work.
+
 - Resolve Electron `window:*` selections to an `HWND`.
 - Use WGC `CreateForWindow(HWND)`.
 - Handle window close, minimize, resize, DPI scaling, and monitor moves.
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index 5607134d0..2ad9bbeab 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -1,16 +1,3 @@
-export function parseWindowHandleFromSourceId(sourceId?: string | null) {
-	if (!sourceId?.startsWith("window:")) {
-		return null;
-	}
-
-	const handlePart = sourceId.split(":")[1];
-	if (!handlePart || !/^\d+$/.test(handlePart)) {
-		return null;
-	}
-
-	return handlePart;
-}
-
 export function buildPowerShellCommand(sampleIntervalMs: number, windowHandle?: string | null) {
 	const script = String.raw`
 $ErrorActionPreference = 'Stop'
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index 8075fe30f..6edee5a37 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -1,16 +1,14 @@
 import { type ChildProcessByStdio, spawn } from "node:child_process";
 import type { Readable } from "node:stream";
 import { screen } from "electron";
+import { parseWindowHandleFromSourceId } from "../../../../src/lib/nativeWindowsRecording";
 import type {
 	CursorRecordingData,
 	CursorRecordingSample,
 	NativeCursorAsset,
 } from "../../../../src/native/contracts";
 import type { CursorRecordingSession } from "./session";
-import {
-	buildPowerShellCommand,
-	parseWindowHandleFromSourceId,
-} from "./windowsNativeRecordingSession.script";
+import { buildPowerShellCommand } from "./windowsNativeRecordingSession.script";
 import type {
 	WindowsCursorEvent,
 	WindowsNativeRecordingSessionOptions,
diff --git a/electron/native/README.md b/electron/native/README.md
index 5df7290b6..b366a1be8 100644
--- a/electron/native/README.md
+++ b/electron/native/README.md
@@ -26,6 +26,7 @@ Current V2 JSON shape:
   "sourceType": "display",
   "sourceId": "screen:0:0",
   "displayId": 1,
+  "windowHandle": null,
   "outputPath": "C:\\path\\recording-123.mp4",
   "videoWidth": 1920,
   "videoHeight": 1080,
@@ -42,12 +43,13 @@ Current V2 JSON shape:
 }
 ```
 
-The current helper implementation supports display video capture, system audio loopback, and initial default-microphone capture. Webcam and window capture now fail explicitly in the helper rather than silently falling back to Electron capture on Windows. See `docs/engineering/windows-native-recorder-roadmap.md` for the phased implementation plan.
+The current helper implementation supports display/window video capture, system audio loopback, and initial default-microphone capture. Webcam capture now fails explicitly in the helper rather than silently falling back to Electron capture on Windows. See `docs/engineering/windows-native-recorder-roadmap.md` for the phased implementation plan.
 
 Smoke-test the helper with:
 
 ```powershell
 npm run test:wgc-helper:win
+npm run test:wgc-window:win
 npm run test:wgc-audio:win
 npm run test:wgc-mic:win
 npm run test:wgc-mixed-audio:win
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 50e55efb8..86f032e0a 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -201,6 +201,36 @@ std::string findString(const std::string& json, const std::string& key) {
     return result;
 }
 
+std::string parseWindowHandleFromSourceId(const std::string& sourceId) {
+    constexpr char prefix[] = "window:";
+    if (sourceId.rfind(prefix, 0) != 0) {
+        return {};
+    }
+
+    const size_t start = sizeof(prefix) - 1;
+    const size_t end = sourceId.find(':', start);
+    const std::string handle = sourceId.substr(start, end == std::string::npos ? std::string::npos : end - start);
+    return handle.empty() ? std::string{} : handle;
+}
+
+HWND parseWindowHandle(const std::string& value) {
+    if (value.empty()) {
+        return nullptr;
+    }
+
+    try {
+        size_t parsed = 0;
+        const int base = value.rfind("0x", 0) == 0 || value.rfind("0X", 0) == 0 ? 16 : 10;
+        const uint64_t handleValue = std::stoull(value, &parsed, base);
+        if (parsed != value.size() || handleValue == 0) {
+            return nullptr;
+        }
+        return reinterpret_cast<HWND>(static_cast<uintptr_t>(handleValue));
+    } catch (...) {
+        return nullptr;
+    }
+}
+
 bool parseConfig(const std::string& json, CaptureConfig& config) {
     config.schemaVersion = findInt(json, "schemaVersion", 1);
     config.outputPath = findString(json, "screenPath");
@@ -218,6 +248,9 @@ bool parseConfig(const std::string& json, CaptureConfig& config) {
     }
     config.sourceId = findString(json, "sourceId");
     config.windowHandle = findString(json, "windowHandle");
+    if (config.windowHandle.empty()) {
+        config.windowHandle = parseWindowHandleFromSourceId(config.sourceId);
+    }
     config.displayId = findInt64(json, "displayId", 0);
     config.fps = std::clamp(findInt(json, "fps", 60), 1, 120);
     config.width = findInt(json, "videoWidth", findInt(json, "width", 0));
@@ -270,27 +303,36 @@ int main(int argc, char* argv[]) {
 
     std::cout << "{\"event\":\"ready\",\"schemaVersion\":2}" << std::endl;
 
-    if (config.sourceType != "display") {
-        std::cerr << "ERROR: Native window capture is not implemented yet" << std::endl;
-        return 1;
-    }
-
     if (config.webcamEnabled) {
         std::cerr << "ERROR: Native webcam capture is not implemented in this helper yet" << std::endl;
         return 1;
     }
 
-    HMONITOR monitor = findMonitorForCapture(
-        config.displayId,
-        config.hasDisplayBounds ? &config.bounds : nullptr);
-    if (!monitor) {
-        std::cerr << "ERROR: Could not resolve monitor" << std::endl;
-        return 1;
-    }
-
     WgcSession session;
-    if (!session.initialize(monitor, config.fps)) {
-        std::cerr << "ERROR: Failed to initialize WGC session" << std::endl;
+    if (config.sourceType == "display") {
+        HMONITOR monitor = findMonitorForCapture(
+            config.displayId,
+            config.hasDisplayBounds ? &config.bounds : nullptr);
+        if (!monitor) {
+            std::cerr << "ERROR: Could not resolve monitor" << std::endl;
+            return 1;
+        }
+        if (!session.initialize(monitor, config.fps)) {
+            std::cerr << "ERROR: Failed to initialize WGC display session" << std::endl;
+            return 1;
+        }
+    } else if (config.sourceType == "window") {
+        HWND window = parseWindowHandle(config.windowHandle);
+        if (!window || !IsWindow(window)) {
+            std::cerr << "ERROR: Native window capture requires a valid HWND" << std::endl;
+            return 1;
+        }
+        if (!session.initialize(window, config.fps)) {
+            std::cerr << "ERROR: Failed to initialize WGC window session" << std::endl;
+            return 1;
+        }
+    } else {
+        std::cerr << "ERROR: Unsupported native capture source type: " << config.sourceType << std::endl;
         return 1;
     }
 
@@ -355,24 +397,72 @@ int main(int argc, char* argv[]) {
     std::atomic<bool> stopRequested = false;
     std::atomic<bool> firstFrameWritten = false;
     std::atomic<bool> encodeFailed = false;
+    Microsoft::WRL::ComPtr<ID3D11Texture2D> latestFrameTexture;
 
     session.setFrameCallback([&](ID3D11Texture2D* texture, int64_t timestampHns) {
+        (void)timestampHns;
         if (stopRequested) {
             return;
         }
 
         std::scoped_lock lock(mutex);
-        if (!encoder.writeFrame(texture, timestampHns)) {
-            encodeFailed = true;
-            stopRequested = true;
-            cv.notify_all();
-            return;
+        if (!latestFrameTexture) {
+            D3D11_TEXTURE2D_DESC desc{};
+            texture->GetDesc(&desc);
+            desc.BindFlags = 0;
+            desc.CPUAccessFlags = 0;
+            desc.MiscFlags = 0;
+            if (FAILED(session.device()->CreateTexture2D(&desc, nullptr, &latestFrameTexture))) {
+                encodeFailed = true;
+                stopRequested = true;
+                cv.notify_all();
+                return;
+            }
         }
+
+        session.context()->CopyResource(latestFrameTexture.Get(), texture);
         if (!firstFrameWritten.exchange(true)) {
             cv.notify_all();
         }
     });
 
+    auto writeVideoFrames = [&]() {
+        const auto startedAt = std::chrono::steady_clock::now();
+        uint64_t frameIndex = 0;
+
+        while (!stopRequested && !encodeFailed) {
+            {
+                std::scoped_lock lock(mutex);
+                if (latestFrameTexture && !encoder.writeFrame(
+                        latestFrameTexture.Get(),
+                        static_cast<int64_t>((frameIndex * 10'000'000ULL) / config.fps))) {
+                    encodeFailed = true;
+                    stopRequested = true;
+                    cv.notify_all();
+                    return;
+                }
+            }
+
+            frameIndex += 1;
+            const auto nextDeadline = startedAt +
+                std::chrono::duration_cast<std::chrono::steady_clock::duration>(
+                    std::chrono::duration<double>(static_cast<double>(frameIndex) / config.fps));
+            std::this_thread::sleep_until(nextDeadline);
+        }
+    };
+
+    std::thread videoWriterThread;
+
+    auto stopVideoWriter = [&]() {
+        if (videoWriterThread.joinable()) {
+            videoWriterThread.join();
+        }
+    };
+
+    auto startVideoWriter = [&]() {
+        videoWriterThread = std::thread(writeVideoFrames);
+    };
+
     std::unique_ptr<AudioMixer> audioMixer;
     auto startAudioCaptures = [&]() -> bool {
         if (!audioFormat) {
@@ -476,6 +566,7 @@ int main(int argc, char* argv[]) {
     if (audioMixer) {
         audioMixer->beginTimeline();
     }
+    startVideoWriter();
 
     std::cout << "{\"event\":\"recording-started\",\"schemaVersion\":2}" << std::endl;
     std::cout << "Recording started" << std::endl;
@@ -492,6 +583,7 @@ int main(int argc, char* argv[]) {
     if (audioMixer) {
         audioMixer->stop();
     }
+    stopVideoWriter();
     session.stop();
     {
         std::scoped_lock lock(mutex);
diff --git a/electron/native/wgc-capture/src/wgc_session.cpp b/electron/native/wgc-capture/src/wgc_session.cpp
index c25444e02..ab7e9e303 100644
--- a/electron/native/wgc-capture/src/wgc_session.cpp
+++ b/electron/native/wgc-capture/src/wgc_session.cpp
@@ -120,6 +120,26 @@ bool WgcSession::createCaptureItem(HMONITOR monitor) {
     return width_ > 0 && height_ > 0;
 }
 
+bool WgcSession::createCaptureItem(HWND window) {
+    auto factory = winrt::get_activation_factory<wgcap::GraphicsCaptureItem>();
+    auto interop = factory.as<IGraphicsCaptureItemInterop>();
+
+    wgcap::GraphicsCaptureItem item{nullptr};
+    HRESULT hr = interop->CreateForWindow(
+        window,
+        winrt::guid_of<wgcap::GraphicsCaptureItem>(),
+        reinterpret_cast<void**>(winrt::put_abi(item)));
+    if (!succeeded(hr, "CreateForWindow")) {
+        return false;
+    }
+
+    item_ = item;
+    const auto size = item_.Size();
+    width_ = static_cast<int>(size.Width);
+    height_ = static_cast<int>(size.Height);
+    return width_ > 0 && height_ > 0;
+}
+
 bool WgcSession::initialize(HMONITOR monitor, int fps) {
     fps_ = fps > 0 ? fps : 60;
     if (!createD3DDevice()) {
@@ -142,6 +162,44 @@ bool WgcSession::initialize(HMONITOR monitor, int fps) {
         // Older WGC builds can omit this property; callers still overlay their own cursor.
     }
 
+    try {
+        session_.IsBorderRequired(false);
+    } catch (...) {
+        // IsBorderRequired is Windows 11-only. Ignore it on older builds.
+    }
+
+    frameArrivedToken_ = framePool_.FrameArrived({this, &WgcSession::onFrameArrived});
+    return true;
+}
+
+bool WgcSession::initialize(HWND window, int fps) {
+    fps_ = fps > 0 ? fps : 60;
+    if (!createD3DDevice()) {
+        return false;
+    }
+    if (!createCaptureItem(window)) {
+        return false;
+    }
+
+    framePool_ = wgcap::Direct3D11CaptureFramePool::CreateFreeThreaded(
+        winrtDevice_,
+        wgdx::DirectXPixelFormat::B8G8R8A8UIntNormalized,
+        2,
+        item_.Size());
+    session_ = framePool_.CreateCaptureSession(item_);
+
+    try {
+        session_.IsCursorCaptureEnabled(false);
+    } catch (...) {
+        // Older WGC builds can omit this property; callers still overlay their own cursor.
+    }
+
+    try {
+        session_.IsBorderRequired(false);
+    } catch (...) {
+        // IsBorderRequired is Windows 11-only. Ignore it on older builds.
+    }
+
     frameArrivedToken_ = framePool_.FrameArrived({this, &WgcSession::onFrameArrived});
     return true;
 }
@@ -204,6 +262,7 @@ void WgcSession::onFrameArrived(
     if (callback) {
         callback(texture.Get(), timeSpanToHns(frame.SystemRelativeTime()));
     }
+    frame.Close();
 }
 
 int WgcSession::captureWidth() const {
diff --git a/electron/native/wgc-capture/src/wgc_session.h b/electron/native/wgc-capture/src/wgc_session.h
index 8cfb05042..34ad3f50d 100644
--- a/electron/native/wgc-capture/src/wgc_session.h
+++ b/electron/native/wgc-capture/src/wgc_session.h
@@ -23,6 +23,7 @@ class WgcSession {
     WgcSession& operator=(const WgcSession&) = delete;
 
     bool initialize(HMONITOR monitor, int fps);
+    bool initialize(HWND window, int fps);
     void setFrameCallback(FrameCallback callback);
     bool start();
     void stop();
@@ -35,6 +36,7 @@ class WgcSession {
 private:
     bool createD3DDevice();
     bool createCaptureItem(HMONITOR monitor);
+    bool createCaptureItem(HWND window);
     void onFrameArrived(
         winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const& sender,
         winrt::Windows::Foundation::IInspectable const&);
diff --git a/package.json b/package.json
index 16db3c908..8878c008c 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
 		"test:watch": "vitest",
 		"test:cursor-native:win": "node scripts/test-windows-native-cursor.mjs",
 		"test:wgc-helper:win": "node scripts/test-windows-wgc-helper.mjs",
+		"test:wgc-window:win": "node scripts/test-windows-wgc-helper.mjs --window",
 		"test:wgc-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio",
 		"test:wgc-mic:win": "node scripts/test-windows-wgc-helper.mjs --microphone",
 		"test:wgc-mixed-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio --microphone",
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index bb6981928..6b5a626f2 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -19,6 +19,8 @@ const WITH_MICROPHONE =
 	process.env.OPENSCREEN_WGC_TEST_MICROPHONE === "true" ||
 	process.argv.includes("--microphone") ||
 	process.argv.includes("--mic");
+const WITH_WINDOW =
+	process.env.OPENSCREEN_WGC_TEST_WINDOW === "true" || process.argv.includes("--window");
 
 function runHelper(config) {
 	return new Promise((resolve, reject) => {
@@ -47,6 +49,47 @@ function runHelper(config) {
 	});
 }
 
+function startFixtureWindow() {
+	return new Promise((resolve, reject) => {
+		const child = spawn("mspaint.exe", [], {
+			stdio: ["ignore", "ignore", "ignore"],
+			windowsHide: false,
+		});
+
+		const poll = setInterval(() => {
+			const lookup = spawnSync(
+				"powershell",
+				[
+					"-NoProfile",
+					"-Command",
+					`(Get-Process -Id ${child.pid} -ErrorAction SilentlyContinue).MainWindowHandle`,
+				],
+				{ encoding: "utf8", windowsHide: true },
+			);
+			const handle = lookup.stdout
+				.trim()
+				.split(/\r?\n/)
+				.find((line) => /^\d+$/.test(line.trim()));
+			if (handle && handle !== "0") {
+				clearInterval(poll);
+				clearTimeout(timer);
+				resolve({ child, sourceId: `window:${handle.trim()}:0` });
+			}
+		}, 250);
+
+		const timer = setTimeout(() => {
+			clearInterval(poll);
+			child.kill();
+			reject(new Error("Timed out waiting for fixture window handle"));
+		}, 10_000);
+		child.once("error", (error) => {
+			clearInterval(poll);
+			clearTimeout(timer);
+			reject(error);
+		});
+	});
+}
+
 function probeStreams(outputPath) {
 	const ffprobe = spawnSync(
 		"ffprobe",
@@ -106,15 +149,17 @@ if (!fs.existsSync(HELPER_PATH)) {
 
 const outputPath = path.join(
 	os.tmpdir(),
-	`openscreen-wgc-helper-${WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${process.pid}-${Date.now()}-${randomUUID()}.mp4`,
+	`openscreen-wgc-helper-${WITH_WINDOW ? "window" : WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${process.pid}-${Date.now()}-${randomUUID()}.mp4`,
 );
 
+const fixtureWindow = WITH_WINDOW ? await startFixtureWindow() : null;
+
 const config = {
 	schemaVersion: 2,
 	recordingId: Date.now(),
 	outputPath,
-	sourceType: "display",
-	sourceId: "screen:0:0",
+	sourceType: fixtureWindow ? "window" : "display",
+	sourceId: fixtureWindow ? fixtureWindow.sourceId : "screen:0:0",
 	displayId: 0,
 	fps: 30,
 	videoWidth: 1280,
@@ -132,7 +177,14 @@ const config = {
 	outputs: { screenPath: outputPath },
 };
 
-const result = await runHelper(config);
+let result;
+try {
+	result = await runHelper(config);
+} finally {
+	if (fixtureWindow) {
+		fixtureWindow.child.kill();
+	}
+}
 if (result.code !== 0) {
 	throw new Error(`WGC helper exited with ${result.code}\n${result.stdout}\n${result.stderr}`);
 }
@@ -151,7 +203,9 @@ if ((WITH_SYSTEM_AUDIO || WITH_MICROPHONE) && !hasAudio) {
 }
 const frameLuma = measureFirstFrameLuma(outputPath);
 if (frameLuma.average < 1 && frameLuma.max < 5) {
-	throw new Error(`WGC helper output first frame is black: ${outputPath}`);
+	throw new Error(
+		`WGC helper output first frame is black: ${outputPath}\n${result.stdout}\n${result.stderr}`,
+	);
 }
 
 console.log(
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 1ae9d2262..88ba90abb 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -2,7 +2,10 @@ import { fixWebmDuration } from "@fix-webm-duration/fix";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import { useScopedT } from "@/contexts/I18nContext";
-import type { NativeWindowsRecordingRequest } from "@/lib/nativeWindowsRecording";
+import {
+	type NativeWindowsRecordingRequest,
+	parseWindowHandleFromSourceId,
+} from "@/lib/nativeWindowsRecording";
 import { requestCameraAccess } from "@/lib/requestCameraAccess";
 
 const TARGET_FRAME_RATE = 60;
@@ -573,12 +576,14 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			const activeRecordingId = Date.now();
 			const displayId = Number(selectedSource.display_id);
 			const sourceType = selectedSource.id.startsWith("window:") ? "window" : "display";
+			const windowHandle = parseWindowHandleFromSourceId(selectedSource.id);
 			const request: NativeWindowsRecordingRequest = {
 				recordingId: activeRecordingId,
 				source: {
 					type: sourceType,
 					sourceId: selectedSource.id,
 					...(Number.isFinite(displayId) ? { displayId } : {}),
+					...(windowHandle ? { windowHandle } : {}),
 				},
 				video: {
 					fps: TARGET_FRAME_RATE,
diff --git a/src/lib/nativeWindowsRecording.ts b/src/lib/nativeWindowsRecording.ts
index d30ef176e..7e2f0bac1 100644
--- a/src/lib/nativeWindowsRecording.ts
+++ b/src/lib/nativeWindowsRecording.ts
@@ -39,3 +39,16 @@ export type NativeWindowsRecordingStartResult = {
 	helperPath?: string;
 	error?: string;
 };
+
+export function parseWindowHandleFromSourceId(sourceId?: string | null) {
+	if (!sourceId?.startsWith("window:")) {
+		return null;
+	}
+
+	const handlePart = sourceId.split(":")[1];
+	if (!handlePart || !/^\d+$/.test(handlePart)) {
+		return null;
+	}
+
+	return handlePart;
+}

From 67fa0aa322e075fb45b1cfa111f6779736c971c5 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 17:50:22 +0200
Subject: [PATCH 15/38] feat: add native Windows webcam composition

---
 .../windows-native-recorder-roadmap.md        |  20 +-
 electron/native/README.md                     |  12 +-
 electron/native/wgc-capture/CMakeLists.txt    |   2 +
 electron/native/wgc-capture/src/main.cpp      |  60 +++-
 .../native/wgc-capture/src/mf_encoder.cpp     |  50 +++-
 electron/native/wgc-capture/src/mf_encoder.h  |  14 +-
 .../native/wgc-capture/src/webcam_capture.cpp | 275 ++++++++++++++++++
 .../native/wgc-capture/src/webcam_capture.h   |  49 ++++
 package.json                                  |   2 +
 scripts/test-windows-wgc-helper.mjs           |  40 ++-
 src/hooks/useScreenRecorder.ts                |  17 ++
 11 files changed, 510 insertions(+), 31 deletions(-)
 create mode 100644 electron/native/wgc-capture/src/webcam_capture.cpp
 create mode 100644 electron/native/wgc-capture/src/webcam_capture.h

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index ac309f919..63abd1dcb 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -9,7 +9,7 @@ OpenScreen's Windows recorder should be owned by one native backend. Electron ca
 - Capture system audio through WASAPI loopback.
 - Capture microphone audio through WASAPI.
 - Mix system audio and microphone audio into the primary screen recording.
-- Capture webcam video natively and keep it as a separate editable OpenScreen media stream.
+- Capture webcam video natively and compose it into the Windows helper MP4 during the native-recording migration.
 - Keep preview/export aligned because screen video, audio, webcam, and cursor share one native timing origin.
 - Keep exported MP4s Windows-friendly: H.264 video plus AAC audio. Opus-in-MP4 is not an acceptable Windows export target.
 - Package the native helper with the Windows app.
@@ -17,7 +17,7 @@ OpenScreen's Windows recorder should be owned by one native backend. Electron ca
 ## Non-Goals
 
 - Replacing the editor/export pipeline.
-- Flattening webcam into the screen recording. The editor currently treats webcam as editable picture-in-picture media, so the native recorder should preserve a separate `webcamVideoPath`.
+- Replacing the editor/export pipeline. A later pass can reintroduce a separate editable native `webcamVideoPath`; the current Windows-native milestone prioritizes a helper-owned multi-flux MP4 with deterministic screen/audio/mic/webcam sync.
 - Adding a native fallback for macOS or Linux in this branch.
 
 ## Target Architecture
@@ -78,7 +78,6 @@ The helper receives a single JSON argument:
   },
   "outputs": {
     "screenPath": "C:\\Users\\me\\recording-123.mp4",
-    "webcamPath": "C:\\Users\\me\\recording-123-webcam.mp4",
     "manifestPath": "C:\\Users\\me\\recording-123.session.json"
   }
 }
@@ -90,7 +89,7 @@ The helper emits newline-delimited JSON events to stdout:
 { "event": "ready", "schemaVersion": 2 }
 { "event": "recording-started", "timestampMs": 1234567890 }
 { "event": "warning", "code": "audio-device-unavailable", "message": "..." }
-{ "event": "recording-stopped", "screenPath": "...", "webcamPath": "..." }
+{ "event": "recording-stopped", "screenPath": "..." }
 { "event": "error", "code": "unsupported-window-source", "message": "..." }
 ```
 
@@ -153,15 +152,16 @@ Acceptance:
 ### 4. Webcam Capture
 
 - Add Media Foundation webcam source reader.
-- Select 1280x720/30fps or nearest supported format.
-- Encode webcam to `recording-<id>-webcam.mp4`.
-- Synchronize webcam timestamps to the native session clock.
-- Store `webcamVideoPath` in the OpenScreen session manifest.
+- Select requested dimensions/fps or the nearest format accepted by Media Foundation.
+- Convert webcam samples to BGRA and compose them into the primary helper MP4 as an initial bottom-right picture-in-picture overlay.
+- Keep the helper process as the SSOT for screen/window, WASAPI system audio, microphone, webcam, and mux timing.
+- Later: promote the same webcam capture source to a separate editable native `webcamVideoPath` if product requirements need post-recording layout edits.
 
 Acceptance:
 
-- Editor loads the native screen recording and the native webcam recording.
-- Webcam layout controls behave the same as today.
+- Native display/window recordings can include webcam without returning to Electron capture.
+- `npm run test:wgc-webcam:win` validates the helper path when a webcam is available and skips explicitly when no webcam device exists.
+- Combined webcam + system audio + microphone produces one MP4 with H.264 video and AAC audio.
 
 ### 5. Native Window Capture
 
diff --git a/electron/native/README.md b/electron/native/README.md
index b366a1be8..037b0408e 100644
--- a/electron/native/README.md
+++ b/electron/native/README.md
@@ -35,15 +35,18 @@ Current V2 JSON shape:
   "captureMic": false,
   "microphoneDeviceId": "default",
   "microphoneGain": 1.4,
-  "webcamEnabled": false,
+  "webcamEnabled": true,
+  "webcamDeviceId": "default",
+  "webcamWidth": 1280,
+  "webcamHeight": 720,
+  "webcamFps": 30,
   "outputs": {
-    "screenPath": "C:\\path\\recording-123.mp4",
-    "webcamPath": "C:\\path\\recording-123-webcam.mp4"
+    "screenPath": "C:\\path\\recording-123.mp4"
   }
 }
 ```
 
-The current helper implementation supports display/window video capture, system audio loopback, and initial default-microphone capture. Webcam capture now fails explicitly in the helper rather than silently falling back to Electron capture on Windows. See `docs/engineering/windows-native-recorder-roadmap.md` for the phased implementation plan.
+The current helper implementation supports display/window video capture, system audio loopback, default-microphone capture, and Media Foundation webcam capture. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links; when the requested webcam is not matched, the helper logs a warning and uses the default webcam.
 
 Smoke-test the helper with:
 
@@ -53,4 +56,5 @@ npm run test:wgc-window:win
 npm run test:wgc-audio:win
 npm run test:wgc-mic:win
 npm run test:wgc-mixed-audio:win
+npm run test:wgc-webcam:win
 ```
diff --git a/electron/native/wgc-capture/CMakeLists.txt b/electron/native/wgc-capture/CMakeLists.txt
index b21fd66de..92b93357d 100644
--- a/electron/native/wgc-capture/CMakeLists.txt
+++ b/electron/native/wgc-capture/CMakeLists.txt
@@ -23,6 +23,8 @@ add_executable(wgc-capture
   src/monitor_utils.h
   src/wasapi_loopback_capture.cpp
   src/wasapi_loopback_capture.h
+  src/webcam_capture.cpp
+  src/webcam_capture.h
   src/wgc_session.cpp
   src/wgc_session.h
 )
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 86f032e0a..bc82b2257 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -2,6 +2,7 @@
 #include "mf_encoder.h"
 #include "monitor_utils.h"
 #include "wasapi_loopback_capture.h"
+#include "webcam_capture.h"
 #include "wgc_session.h"
 
 #include <winrt/Windows.Foundation.h>
@@ -303,11 +304,6 @@ int main(int argc, char* argv[]) {
 
     std::cout << "{\"event\":\"ready\",\"schemaVersion\":2}" << std::endl;
 
-    if (config.webcamEnabled) {
-        std::cerr << "ERROR: Native webcam capture is not implemented in this helper yet" << std::endl;
-        return 1;
-    }
-
     WgcSession session;
     if (config.sourceType == "display") {
         HMONITOR monitor = findMonitorForCapture(
@@ -347,6 +343,22 @@ int main(int argc, char* argv[]) {
     const int pixels = width * height;
     const int bitrate = pixels >= 3840 * 2160 ? 45'000'000 : pixels >= 2560 * 1440 ? 28'000'000 : 18'000'000;
 
+    WebcamCapture webcamCapture;
+    bool webcamActive = false;
+    if (config.webcamEnabled) {
+        if (!webcamCapture.initialize(
+                utf8ToWide(config.webcamDeviceId),
+                config.webcamWidth,
+                config.webcamHeight,
+                config.webcamFps > 0 ? config.webcamFps : config.fps)) {
+            std::cerr << "ERROR: Failed to initialize native webcam capture" << std::endl;
+            return 1;
+        }
+        std::cout << "{\"event\":\"webcam-format\",\"schemaVersion\":2,\"width\":" << webcamCapture.width()
+                  << ",\"height\":" << webcamCapture.height()
+                  << ",\"fps\":" << webcamCapture.fps() << "}" << std::endl;
+    }
+
     WasapiLoopbackCapture loopbackCapture;
     WasapiLoopbackCapture microphoneCapture;
     const AudioInputFormat* audioFormat = nullptr;
@@ -398,6 +410,9 @@ int main(int argc, char* argv[]) {
     std::atomic<bool> firstFrameWritten = false;
     std::atomic<bool> encodeFailed = false;
     Microsoft::WRL::ComPtr<ID3D11Texture2D> latestFrameTexture;
+    std::vector<BYTE> latestWebcamFrame;
+    int latestWebcamWidth = 0;
+    int latestWebcamHeight = 0;
 
     session.setFrameCallback([&](ID3D11Texture2D* texture, int64_t timestampHns) {
         (void)timestampHns;
@@ -433,9 +448,18 @@ int main(int argc, char* argv[]) {
         while (!stopRequested && !encodeFailed) {
             {
                 std::scoped_lock lock(mutex);
+                if (webcamActive) {
+                    webcamCapture.copyLatestFrame(latestWebcamFrame, latestWebcamWidth, latestWebcamHeight);
+                }
+                const BgraFrameView webcamFrame{
+                    latestWebcamFrame.empty() ? nullptr : latestWebcamFrame.data(),
+                    latestWebcamWidth,
+                    latestWebcamHeight,
+                };
                 if (latestFrameTexture && !encoder.writeFrame(
                         latestFrameTexture.Get(),
-                        static_cast<int64_t>((frameIndex * 10'000'000ULL) / config.fps))) {
+                        static_cast<int64_t>((frameIndex * 10'000'000ULL) / config.fps),
+                        webcamFrame.data ? &webcamFrame : nullptr)) {
                     encodeFailed = true;
                     stopRequested = true;
                     cv.notify_all();
@@ -528,8 +552,30 @@ int main(int argc, char* argv[]) {
     if (!startAudioCaptures()) {
         return 1;
     }
+    if (config.webcamEnabled) {
+        if (!webcamCapture.start()) {
+            microphoneCapture.stop();
+            loopbackCapture.stop();
+            if (audioMixer) {
+                audioMixer->stop();
+            }
+            std::cerr << "ERROR: Failed to start native webcam capture" << std::endl;
+            return 1;
+        }
+        webcamActive = true;
+        const auto webcamDeadline = std::chrono::steady_clock::now() + std::chrono::seconds(3);
+        while (std::chrono::steady_clock::now() < webcamDeadline &&
+               !webcamCapture.copyLatestFrame(latestWebcamFrame, latestWebcamWidth, latestWebcamHeight)) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(20));
+        }
+        if (latestWebcamFrame.empty()) {
+            std::cerr << "WARNING: Native webcam started but no frame was available before screen capture"
+                      << std::endl;
+        }
+    }
 
     if (!session.start()) {
+        webcamCapture.stop();
         microphoneCapture.stop();
         loopbackCapture.stop();
         if (audioMixer) {
@@ -554,6 +600,7 @@ int main(int argc, char* argv[]) {
             }
             microphoneCapture.stop();
             loopbackCapture.stop();
+            webcamCapture.stop();
             if (audioMixer) {
                 audioMixer->stop();
             }
@@ -580,6 +627,7 @@ int main(int argc, char* argv[]) {
 
     microphoneCapture.stop();
     loopbackCapture.stop();
+    webcamCapture.stop();
     if (audioMixer) {
         audioMixer->stop();
     }
diff --git a/electron/native/wgc-capture/src/mf_encoder.cpp b/electron/native/wgc-capture/src/mf_encoder.cpp
index fc95fc23e..de9220f17 100644
--- a/electron/native/wgc-capture/src/mf_encoder.cpp
+++ b/electron/native/wgc-capture/src/mf_encoder.cpp
@@ -38,6 +38,43 @@ void setAudioFormat(IMFMediaType* type, UINT32 channels, UINT32 sampleRate, UINT
     type->SetUINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, bitsPerSample);
 }
 
+void compositeWebcam(BYTE* destination, int width, int height, const BgraFrameView& webcamFrame) {
+    if (!webcamFrame.data || webcamFrame.width <= 0 || webcamFrame.height <= 0 || width <= 0 || height <= 0) {
+        return;
+    }
+
+    const int margin = std::max(16, std::min(width, height) / 60);
+    const int maxOverlayWidth = std::max(2, width / 4);
+    int overlayWidth = maxOverlayWidth;
+    int overlayHeight = static_cast<int>(
+        (static_cast<int64_t>(overlayWidth) * webcamFrame.height) / std::max(1, webcamFrame.width));
+    const int maxOverlayHeight = std::max(2, height / 3);
+    if (overlayHeight > maxOverlayHeight) {
+        overlayHeight = maxOverlayHeight;
+        overlayWidth = static_cast<int>(
+            (static_cast<int64_t>(overlayHeight) * webcamFrame.width) / std::max(1, webcamFrame.height));
+    }
+
+    overlayWidth = std::max(2, std::min(overlayWidth, width - margin * 2));
+    overlayHeight = std::max(2, std::min(overlayHeight, height - margin * 2));
+    const int originX = std::max(0, width - overlayWidth - margin);
+    const int originY = std::max(0, height - overlayHeight - margin);
+
+    for (int y = 0; y < overlayHeight; y += 1) {
+        const int sourceY = static_cast<int>((static_cast<int64_t>(y) * webcamFrame.height) / overlayHeight);
+        BYTE* destinationRow = destination + ((originY + y) * width + originX) * 4;
+        for (int x = 0; x < overlayWidth; x += 1) {
+            const int sourceX = static_cast<int>((static_cast<int64_t>(x) * webcamFrame.width) / overlayWidth);
+            const BYTE* source = webcamFrame.data + (sourceY * webcamFrame.width + sourceX) * 4;
+            BYTE* target = destinationRow + x * 4;
+            target[0] = source[0];
+            target[1] = source[1];
+            target[2] = source[2];
+            target[3] = 255;
+        }
+    }
+}
+
 } // namespace
 
 MFEncoder::~MFEncoder() {
@@ -179,7 +216,11 @@ bool MFEncoder::ensureStagingTexture(ID3D11Texture2D* texture) {
                      "CreateTexture2D(staging)");
 }
 
-bool MFEncoder::copyFrameToBuffer(ID3D11Texture2D* texture, BYTE* destination, DWORD destinationSize) {
+bool MFEncoder::copyFrameToBuffer(
+    ID3D11Texture2D* texture,
+    BYTE* destination,
+    DWORD destinationSize,
+    const BgraFrameView* webcamFrame) {
     if (!ensureStagingTexture(texture)) {
         return false;
     }
@@ -203,12 +244,15 @@ bool MFEncoder::copyFrameToBuffer(ID3D11Texture2D* texture, BYTE* destination, D
     for (int y = 0; y < height_; y += 1) {
         std::memcpy(destination + rowBytes * y, source + mapped.RowPitch * y, rowBytes);
     }
+    if (webcamFrame) {
+        compositeWebcam(destination, width_, height_, *webcamFrame);
+    }
 
     context_->Unmap(stagingTexture_.Get(), 0);
     return true;
 }
 
-bool MFEncoder::writeFrame(ID3D11Texture2D* texture, int64_t timestampHns) {
+bool MFEncoder::writeFrame(ID3D11Texture2D* texture, int64_t timestampHns, const BgraFrameView* webcamFrame) {
     std::scoped_lock writerLock(writerMutex_);
     if (!sinkWriter_ || finalized_) {
         return false;
@@ -238,7 +282,7 @@ bool MFEncoder::writeFrame(ID3D11Texture2D* texture, int64_t timestampHns) {
         return false;
     }
 
-    const bool copied = copyFrameToBuffer(texture, data, maxLength);
+    const bool copied = copyFrameToBuffer(texture, data, maxLength, webcamFrame);
     buffer->Unlock();
     if (!copied) {
         return false;
diff --git a/electron/native/wgc-capture/src/mf_encoder.h b/electron/native/wgc-capture/src/mf_encoder.h
index b6db68585..a82a94023 100644
--- a/electron/native/wgc-capture/src/mf_encoder.h
+++ b/electron/native/wgc-capture/src/mf_encoder.h
@@ -11,6 +11,12 @@
 #include <mutex>
 #include <string>
 
+struct BgraFrameView {
+    const BYTE* data = nullptr;
+    int width = 0;
+    int height = 0;
+};
+
 struct AudioInputFormat {
     GUID subtype = MFAudioFormat_PCM;
     UINT32 sampleRate = 0;
@@ -37,13 +43,17 @@ class MFEncoder {
         ID3D11Device* device,
         ID3D11DeviceContext* context,
         const AudioInputFormat* audioFormat = nullptr);
-    bool writeFrame(ID3D11Texture2D* texture, int64_t timestampHns);
+    bool writeFrame(ID3D11Texture2D* texture, int64_t timestampHns, const BgraFrameView* webcamFrame = nullptr);
     bool writeAudio(const BYTE* data, DWORD byteCount, int64_t timestampHns, int64_t durationHns);
     bool finalize();
 
 private:
     bool ensureStagingTexture(ID3D11Texture2D* texture);
-    bool copyFrameToBuffer(ID3D11Texture2D* texture, BYTE* destination, DWORD destinationSize);
+    bool copyFrameToBuffer(
+        ID3D11Texture2D* texture,
+        BYTE* destination,
+        DWORD destinationSize,
+        const BgraFrameView* webcamFrame);
     bool configureAudioStream(const AudioInputFormat& audioFormat);
 
     Microsoft::WRL::ComPtr<IMFSinkWriter> sinkWriter_;
diff --git a/electron/native/wgc-capture/src/webcam_capture.cpp b/electron/native/wgc-capture/src/webcam_capture.cpp
new file mode 100644
index 000000000..6b34a35c2
--- /dev/null
+++ b/electron/native/wgc-capture/src/webcam_capture.cpp
@@ -0,0 +1,275 @@
+#include "webcam_capture.h"
+
+#include <mfapi.h>
+#include <mferror.h>
+#include <propvarutil.h>
+
+#include <algorithm>
+#include <chrono>
+#include <iostream>
+
+namespace {
+
+bool succeeded(HRESULT hr, const char* label) {
+    if (SUCCEEDED(hr)) {
+        return true;
+    }
+
+    std::cerr << "ERROR: " << label << " failed (hr=0x" << std::hex << hr << std::dec << ")"
+              << std::endl;
+    return false;
+}
+
+std::wstring readAllocatedString(IMFActivate* activate, REFGUID key) {
+    WCHAR* value = nullptr;
+    UINT32 length = 0;
+    if (FAILED(activate->GetAllocatedString(key, &value, &length)) || !value) {
+        return {};
+    }
+
+    std::wstring result(value, value + length);
+    CoTaskMemFree(value);
+    return result;
+}
+
+bool containsInsensitive(const std::wstring& haystack, const std::wstring& needle) {
+    if (haystack.empty() || needle.empty()) {
+        return false;
+    }
+
+    std::wstring lowerHaystack = haystack;
+    std::wstring lowerNeedle = needle;
+    std::transform(lowerHaystack.begin(), lowerHaystack.end(), lowerHaystack.begin(), ::towlower);
+    std::transform(lowerNeedle.begin(), lowerNeedle.end(), lowerNeedle.begin(), ::towlower);
+    return lowerHaystack.find(lowerNeedle) != std::wstring::npos ||
+        lowerNeedle.find(lowerHaystack) != std::wstring::npos;
+}
+
+} // namespace
+
+WebcamCapture::~WebcamCapture() {
+    stop();
+}
+
+bool WebcamCapture::initialize(const std::wstring& deviceId, int requestedWidth, int requestedHeight, int requestedFps) {
+    fps_ = std::clamp(requestedFps > 0 ? requestedFps : 30, 1, 60);
+    if (!succeeded(MFStartup(MF_VERSION), "MFStartup(webcam)")) {
+        return false;
+    }
+    mfStarted_ = true;
+    if (!selectDevice(deviceId)) {
+        return false;
+    }
+
+    return configureReader(requestedWidth, requestedHeight, fps_);
+}
+
+bool WebcamCapture::selectDevice(const std::wstring& deviceId) {
+    Microsoft::WRL::ComPtr<IMFAttributes> attributes;
+    if (!succeeded(MFCreateAttributes(&attributes, 1), "MFCreateAttributes(webcam enumeration)")) {
+        return false;
+    }
+    if (!succeeded(attributes->SetGUID(
+            MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE,
+            MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID),
+            "SetGUID(webcam source type)")) {
+        return false;
+    }
+
+    IMFActivate** devices = nullptr;
+    UINT32 deviceCount = 0;
+    HRESULT hr = MFEnumDeviceSources(attributes.Get(), &devices, &deviceCount);
+    if (!succeeded(hr, "MFEnumDeviceSources") || deviceCount == 0) {
+        if (devices) {
+            CoTaskMemFree(devices);
+        }
+        std::cerr << "ERROR: No native Windows webcam devices were found" << std::endl;
+        return false;
+    }
+
+    UINT32 selectedIndex = 0;
+    for (UINT32 index = 0; index < deviceCount; index += 1) {
+        const std::wstring name = readAllocatedString(devices[index], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
+        const std::wstring symbolicLink = readAllocatedString(devices[index], MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK);
+        if (!deviceId.empty() && (containsInsensitive(symbolicLink, deviceId) || containsInsensitive(name, deviceId))) {
+            selectedIndex = index;
+            break;
+        }
+    }
+
+    if (!deviceId.empty() && selectedIndex == 0) {
+        const std::wstring firstName = readAllocatedString(devices[0], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
+        const std::wstring firstLink = readAllocatedString(devices[0], MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK);
+        if (!containsInsensitive(firstLink, deviceId) && !containsInsensitive(firstName, deviceId)) {
+            std::cerr << "WARNING: Requested webcam device was not found by Media Foundation; using default webcam"
+                      << std::endl;
+        }
+    }
+
+    selectedDeviceName_ = readAllocatedString(devices[selectedIndex], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
+    hr = devices[selectedIndex]->ActivateObject(IID_PPV_ARGS(&mediaSource_));
+
+    for (UINT32 index = 0; index < deviceCount; index += 1) {
+        devices[index]->Release();
+    }
+    CoTaskMemFree(devices);
+
+    return succeeded(hr, "ActivateObject(webcam)");
+}
+
+bool WebcamCapture::configureReader(int requestedWidth, int requestedHeight, int requestedFps) {
+    Microsoft::WRL::ComPtr<IMFAttributes> attributes;
+    if (!succeeded(MFCreateAttributes(&attributes, 2), "MFCreateAttributes(webcam reader)")) {
+        return false;
+    }
+    attributes->SetUINT32(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, TRUE);
+    attributes->SetUINT32(MF_READWRITE_DISABLE_CONVERTERS, FALSE);
+
+    if (!succeeded(MFCreateSourceReaderFromMediaSource(mediaSource_.Get(), attributes.Get(), &sourceReader_),
+                   "MFCreateSourceReaderFromMediaSource(webcam)")) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IMFMediaType> mediaType;
+    if (!succeeded(MFCreateMediaType(&mediaType), "MFCreateMediaType(webcam output)")) {
+        return false;
+    }
+    mediaType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
+    mediaType->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32);
+    if (requestedWidth > 0 && requestedHeight > 0) {
+        MFSetAttributeSize(mediaType.Get(), MF_MT_FRAME_SIZE, static_cast<UINT32>(requestedWidth), static_cast<UINT32>(requestedHeight));
+    }
+    MFSetAttributeRatio(mediaType.Get(), MF_MT_FRAME_RATE, static_cast<UINT32>(std::max(1, requestedFps)), 1);
+
+    if (!succeeded(sourceReader_->SetCurrentMediaType(MF_SOURCE_READER_FIRST_VIDEO_STREAM, nullptr, mediaType.Get()),
+                   "SetCurrentMediaType(webcam RGB32)")) {
+        return false;
+    }
+    sourceReader_->SetStreamSelection(MF_SOURCE_READER_ALL_STREAMS, FALSE);
+    sourceReader_->SetStreamSelection(MF_SOURCE_READER_FIRST_VIDEO_STREAM, TRUE);
+
+    Microsoft::WRL::ComPtr<IMFMediaType> currentType;
+    if (!succeeded(sourceReader_->GetCurrentMediaType(MF_SOURCE_READER_FIRST_VIDEO_STREAM, &currentType),
+                   "GetCurrentMediaType(webcam)")) {
+        return false;
+    }
+
+    UINT32 width = 0;
+    UINT32 height = 0;
+    if (FAILED(MFGetAttributeSize(currentType.Get(), MF_MT_FRAME_SIZE, &width, &height)) || width == 0 || height == 0) {
+        width = static_cast<UINT32>(requestedWidth > 0 ? requestedWidth : 1280);
+        height = static_cast<UINT32>(requestedHeight > 0 ? requestedHeight : 720);
+    }
+    width_ = static_cast<int>(width);
+    height_ = static_cast<int>(height);
+    return true;
+}
+
+bool WebcamCapture::start() {
+    if (!sourceReader_ || thread_.joinable()) {
+        return false;
+    }
+
+    stopRequested_ = false;
+    thread_ = std::thread(&WebcamCapture::captureLoop, this);
+    return true;
+}
+
+void WebcamCapture::stop() {
+    stopRequested_ = true;
+    if (thread_.joinable()) {
+        thread_.join();
+    }
+    if (mediaSource_) {
+        mediaSource_->Shutdown();
+    }
+    sourceReader_.Reset();
+    mediaSource_.Reset();
+    if (mfStarted_) {
+        MFShutdown();
+        mfStarted_ = false;
+    }
+}
+
+void WebcamCapture::captureLoop() {
+    CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+
+    while (!stopRequested_) {
+        DWORD streamIndex = 0;
+        DWORD flags = 0;
+        LONGLONG timestamp = 0;
+        Microsoft::WRL::ComPtr<IMFSample> sample;
+        HRESULT hr = sourceReader_->ReadSample(
+            MF_SOURCE_READER_FIRST_VIDEO_STREAM,
+            0,
+            &streamIndex,
+            &flags,
+            &timestamp,
+            &sample);
+        (void)streamIndex;
+        (void)timestamp;
+
+        if (FAILED(hr)) {
+            std::cerr << "WARNING: Failed to read webcam sample (hr=0x" << std::hex << hr << std::dec << ")"
+                      << std::endl;
+            std::this_thread::sleep_for(std::chrono::milliseconds(20));
+            continue;
+        }
+        if ((flags & MF_SOURCE_READERF_ENDOFSTREAM) != 0) {
+            break;
+        }
+        if (!sample) {
+            continue;
+        }
+
+        Microsoft::WRL::ComPtr<IMFMediaBuffer> buffer;
+        if (FAILED(sample->ConvertToContiguousBuffer(&buffer)) || !buffer) {
+            continue;
+        }
+
+        BYTE* data = nullptr;
+        DWORD maxLength = 0;
+        DWORD currentLength = 0;
+        if (FAILED(buffer->Lock(&data, &maxLength, &currentLength)) || !data) {
+            continue;
+        }
+
+        const DWORD expectedLength = static_cast<DWORD>(std::max(0, width_) * std::max(0, height_) * 4);
+        if (currentLength >= expectedLength && expectedLength > 0) {
+            std::scoped_lock lock(frameMutex_);
+            latestFrame_.assign(data, data + expectedLength);
+        }
+
+        buffer->Unlock();
+    }
+
+    CoUninitialize();
+}
+
+bool WebcamCapture::copyLatestFrame(std::vector<BYTE>& destination, int& width, int& height) {
+    std::scoped_lock lock(frameMutex_);
+    if (latestFrame_.empty() || width_ <= 0 || height_ <= 0) {
+        return false;
+    }
+
+    destination = latestFrame_;
+    width = width_;
+    height = height_;
+    return true;
+}
+
+int WebcamCapture::width() const {
+    return width_;
+}
+
+int WebcamCapture::height() const {
+    return height_;
+}
+
+int WebcamCapture::fps() const {
+    return fps_;
+}
+
+const std::wstring& WebcamCapture::selectedDeviceName() const {
+    return selectedDeviceName_;
+}
diff --git a/electron/native/wgc-capture/src/webcam_capture.h b/electron/native/wgc-capture/src/webcam_capture.h
new file mode 100644
index 000000000..7d5f90439
--- /dev/null
+++ b/electron/native/wgc-capture/src/webcam_capture.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <Windows.h>
+#include <mfidl.h>
+#include <mfreadwrite.h>
+#include <wrl/client.h>
+
+#include <atomic>
+#include <cstdint>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+class WebcamCapture {
+public:
+    WebcamCapture() = default;
+    ~WebcamCapture();
+
+    WebcamCapture(const WebcamCapture&) = delete;
+    WebcamCapture& operator=(const WebcamCapture&) = delete;
+
+    bool initialize(const std::wstring& deviceId, int requestedWidth, int requestedHeight, int requestedFps);
+    bool start();
+    void stop();
+    bool copyLatestFrame(std::vector<BYTE>& destination, int& width, int& height);
+
+    int width() const;
+    int height() const;
+    int fps() const;
+    const std::wstring& selectedDeviceName() const;
+
+private:
+    bool selectDevice(const std::wstring& deviceId);
+    bool configureReader(int requestedWidth, int requestedHeight, int requestedFps);
+    void captureLoop();
+
+    Microsoft::WRL::ComPtr<IMFMediaSource> mediaSource_;
+    Microsoft::WRL::ComPtr<IMFSourceReader> sourceReader_;
+    std::thread thread_;
+    std::atomic<bool> stopRequested_ = false;
+    std::mutex frameMutex_;
+    std::vector<BYTE> latestFrame_;
+    int width_ = 0;
+    int height_ = 0;
+    int fps_ = 30;
+    bool mfStarted_ = false;
+    std::wstring selectedDeviceName_;
+};
diff --git a/package.json b/package.json
index 8878c008c..5724af697 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,8 @@
 		"test:wgc-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio",
 		"test:wgc-mic:win": "node scripts/test-windows-wgc-helper.mjs --microphone",
 		"test:wgc-mixed-audio:win": "node scripts/test-windows-wgc-helper.mjs --system-audio --microphone",
+		"test:wgc-webcam:win": "node scripts/test-windows-wgc-helper.mjs --webcam",
+		"test:wgc-full:win": "node scripts/test-windows-wgc-helper.mjs --webcam --system-audio --microphone",
 		"capture:openscreen-preview": "node scripts/capture-openscreen-preview.mjs",
 		"build-vite": "tsc && vite build",
 		"test:browser": "vitest --config vitest.browser.config.ts --run",
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index 6b5a626f2..3bdba5752 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -21,6 +21,8 @@ const WITH_MICROPHONE =
 	process.argv.includes("--mic");
 const WITH_WINDOW =
 	process.env.OPENSCREEN_WGC_TEST_WINDOW === "true" || process.argv.includes("--window");
+const WITH_WEBCAM =
+	process.env.OPENSCREEN_WGC_TEST_WEBCAM === "true" || process.argv.includes("--webcam");
 
 function runHelper(config) {
 	return new Promise((resolve, reject) => {
@@ -31,21 +33,34 @@ function runHelper(config) {
 
 		let stdout = "";
 		let stderr = "";
+		let stopTimer = null;
+		const scheduleStop = () => {
+			if (stopTimer) {
+				return;
+			}
+			stopTimer = setTimeout(() => {
+				child.stdin.write("stop\n");
+			}, DURATION_MS);
+		};
+		const fallbackTimer = setTimeout(scheduleStop, 15_000);
 
 		child.stdout.on("data", (chunk) => {
 			stdout += chunk.toString();
+			if (stdout.includes('"recording-started"') || stdout.includes("Recording started")) {
+				scheduleStop();
+			}
 		});
 		child.stderr.on("data", (chunk) => {
 			stderr += chunk.toString();
 		});
 		child.once("error", reject);
 		child.once("exit", (code) => {
+			clearTimeout(fallbackTimer);
+			if (stopTimer) {
+				clearTimeout(stopTimer);
+			}
 			resolve({ code, stdout, stderr });
 		});
-
-		setTimeout(() => {
-			child.stdin.write("stop\n");
-		}, DURATION_MS);
 	});
 }
 
@@ -149,7 +164,7 @@ if (!fs.existsSync(HELPER_PATH)) {
 
 const outputPath = path.join(
 	os.tmpdir(),
-	`openscreen-wgc-helper-${WITH_WINDOW ? "window" : WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${process.pid}-${Date.now()}-${randomUUID()}.mp4`,
+	`openscreen-wgc-helper-${WITH_WEBCAM ? "webcam" : WITH_WINDOW ? "window" : WITH_SYSTEM_AUDIO || WITH_MICROPHONE ? "audio" : "video"}-${process.pid}-${Date.now()}-${randomUUID()}.mp4`,
 );
 
 const fixtureWindow = WITH_WINDOW ? await startFixtureWindow() : null;
@@ -173,7 +188,11 @@ const config = {
 	captureMic: WITH_MICROPHONE,
 	microphoneDeviceId: "default",
 	microphoneGain: 1.4,
-	webcamEnabled: false,
+	webcamEnabled: WITH_WEBCAM,
+	webcamDeviceId: process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_ID ?? "",
+	webcamWidth: 640,
+	webcamHeight: 360,
+	webcamFps: 30,
 	outputs: { screenPath: outputPath },
 };
 
@@ -186,6 +205,15 @@ try {
 	}
 }
 if (result.code !== 0) {
+	if (
+		WITH_WEBCAM &&
+		/No native Windows webcam devices were found|Failed to initialize native webcam/.test(
+			result.stderr,
+		)
+	) {
+		console.log("Skipping WGC webcam smoke test: no native Windows webcam device is available.");
+		process.exit(0);
+	}
 	throw new Error(`WGC helper exited with ${result.code}\n${result.stdout}\n${result.stderr}`);
 }
 if (!fs.existsSync(outputPath) || fs.statSync(outputPath).size === 0) {
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 88ba90abb..394795474 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -182,6 +182,20 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		}
 	}, []);
 
+	const stopWebcamPreviewStream = useCallback(() => {
+		if (!webcamStream.current) {
+			return;
+		}
+
+		webcamAcquireId.current++;
+		webcamStream.current.getTracks().forEach((track) => {
+			track.onended = null;
+			track.stop();
+		});
+		webcamStream.current = null;
+		webcamReady.current = true;
+	}, []);
+
 	const setWebcamEnabled = useCallback(
 		async (enabled: boolean) => {
 			if (!enabled) {
@@ -577,6 +591,9 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			const displayId = Number(selectedSource.display_id);
 			const sourceType = selectedSource.id.startsWith("window:") ? "window" : "display";
 			const windowHandle = parseWindowHandleFromSourceId(selectedSource.id);
+			if (webcamEnabled) {
+				stopWebcamPreviewStream();
+			}
 			const request: NativeWindowsRecordingRequest = {
 				recordingId: activeRecordingId,
 				source: {

From 779dee5d4d4cced852e738e30e02d44721702eb8 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 18:06:43 +0200
Subject: [PATCH 16/38] fix: honor selected native Windows webcam

---
 .../windows-native-recorder-roadmap.md        |  3 ++
 electron/ipc/handlers.ts                      |  1 +
 electron/native/README.md                     | 11 +++++-
 electron/native/wgc-capture/src/main.cpp      | 18 ++++++++-
 .../native/wgc-capture/src/webcam_capture.cpp | 37 +++++++++++++------
 .../native/wgc-capture/src/webcam_capture.h   |  9 ++++-
 scripts/test-windows-wgc-helper.mjs           |  1 +
 src/components/launch/LaunchWindow.tsx        | 16 ++++++--
 src/hooks/useScreenRecorder.ts                |  6 +++
 src/lib/nativeWindowsRecording.ts             |  1 +
 10 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index 63abd1dcb..12c950201 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -71,6 +71,7 @@ The helper receives a single JSON argument:
   "webcam": {
     "enabled": true,
     "deviceId": "default",
+    "deviceName": "Camera (NVIDIA Broadcast)",
     "width": 1280,
     "height": 720,
     "fps": 30,
@@ -133,6 +134,7 @@ SSOT rules for this phase:
 - `docs/engineering/windows-native-recorder-roadmap.md` is the feature-level contract and phase checklist.
 - `WgcSession::captureWidth()/captureHeight()` is the encoded screen frame size until a dedicated native scaling stage exists.
 - `WasapiLoopbackCapture::inputFormat()` is the runtime audio format source used by `MFEncoder`.
+- The renderer passes both the browser webcam `deviceId` and selected display label as `deviceName`; `electron/native/wgc-capture/src/webcam_capture.*` is the only place that maps those values to Media Foundation devices.
 - No duplicated hard-coded audio format assumptions in `main.cpp`.
 
 ### 3. WASAPI Microphone
@@ -155,6 +157,7 @@ Acceptance:
 - Select requested dimensions/fps or the nearest format accepted by Media Foundation.
 - Convert webcam samples to BGRA and compose them into the primary helper MP4 as an initial bottom-right picture-in-picture overlay.
 - Keep the helper process as the SSOT for screen/window, WASAPI system audio, microphone, webcam, and mux timing.
+- Match the requested webcam through Media Foundation friendly names first, then browser device ids/symbolic links, so UI selection remains stable across Chromium and Windows native device namespaces.
 - Later: promote the same webcam capture source to a separate editable native `webcamVideoPath` if product requirements need post-recording layout edits.
 
 Acceptance:
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 19f300adc..768305e57 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -844,6 +844,7 @@ export function registerIpcHandlers(
 					microphoneGain: request.audio.microphone.gain,
 					webcamEnabled: request.webcam.enabled,
 					webcamDeviceId: request.webcam.deviceId ?? null,
+					webcamDeviceName: request.webcam.deviceName ?? null,
 					webcamWidth: request.webcam.width,
 					webcamHeight: request.webcam.height,
 					webcamFps: request.webcam.fps,
diff --git a/electron/native/README.md b/electron/native/README.md
index 037b0408e..844f79c7b 100644
--- a/electron/native/README.md
+++ b/electron/native/README.md
@@ -37,6 +37,7 @@ Current V2 JSON shape:
   "microphoneGain": 1.4,
   "webcamEnabled": true,
   "webcamDeviceId": "default",
+  "webcamDeviceName": "Camera (NVIDIA Broadcast)",
   "webcamWidth": 1280,
   "webcamHeight": 720,
   "webcamFps": 30,
@@ -46,7 +47,7 @@ Current V2 JSON shape:
 }
 ```
 
-The current helper implementation supports display/window video capture, system audio loopback, default-microphone capture, and Media Foundation webcam capture. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links; when the requested webcam is not matched, the helper logs a warning and uses the default webcam.
+The current helper implementation supports display/window video capture, system audio loopback, default-microphone capture, and Media Foundation webcam capture. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links, so the renderer passes both `webcamDeviceId` and `webcamDeviceName`. The helper treats the Media Foundation friendly name as the preferred stable selector, then tries the browser id, and only falls back to the default webcam with an explicit warning when no requested device matches.
 
 Smoke-test the helper with:
 
@@ -58,3 +59,11 @@ npm run test:wgc-mic:win
 npm run test:wgc-mixed-audio:win
 npm run test:wgc-webcam:win
 ```
+
+To validate a specific native webcam manually:
+
+```powershell
+$env:OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME = "NVIDIA Broadcast"
+npm run test:wgc-webcam:win
+Remove-Item Env:OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME
+```
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index bc82b2257..56c34be7d 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -40,6 +40,7 @@ struct CaptureConfig {
     std::string microphoneDeviceId;
     double microphoneGain = 1.0;
     std::string webcamDeviceId;
+    std::string webcamDeviceName;
     int webcamWidth = 0;
     int webcamHeight = 0;
     int webcamFps = 0;
@@ -56,6 +57,17 @@ std::wstring utf8ToWide(const std::string& value) {
     return result;
 }
 
+std::string wideToUtf8(const std::wstring& value) {
+    if (value.empty()) {
+        return {};
+    }
+
+    const int size = WideCharToMultiByte(CP_UTF8, 0, value.data(), static_cast<int>(value.size()), nullptr, 0, nullptr, nullptr);
+    std::string result(static_cast<size_t>(size), '\0');
+    WideCharToMultiByte(CP_UTF8, 0, value.data(), static_cast<int>(value.size()), result.data(), size, nullptr, nullptr);
+    return result;
+}
+
 std::string jsonEscape(const std::string& value) {
     std::string result;
     result.reserve(value.size());
@@ -267,6 +279,7 @@ bool parseConfig(const std::string& json, CaptureConfig& config) {
     config.microphoneDeviceId = findString(json, "microphoneDeviceId");
     config.microphoneGain = findDouble(json, "microphoneGain", 1.0);
     config.webcamDeviceId = findString(json, "webcamDeviceId");
+    config.webcamDeviceName = findString(json, "webcamDeviceName");
     config.webcamWidth = findInt(json, "webcamWidth", 0);
     config.webcamHeight = findInt(json, "webcamHeight", 0);
     config.webcamFps = findInt(json, "webcamFps", 0);
@@ -348,6 +361,7 @@ int main(int argc, char* argv[]) {
     if (config.webcamEnabled) {
         if (!webcamCapture.initialize(
                 utf8ToWide(config.webcamDeviceId),
+                utf8ToWide(config.webcamDeviceName),
                 config.webcamWidth,
                 config.webcamHeight,
                 config.webcamFps > 0 ? config.webcamFps : config.fps)) {
@@ -356,7 +370,9 @@ int main(int argc, char* argv[]) {
         }
         std::cout << "{\"event\":\"webcam-format\",\"schemaVersion\":2,\"width\":" << webcamCapture.width()
                   << ",\"height\":" << webcamCapture.height()
-                  << ",\"fps\":" << webcamCapture.fps() << "}" << std::endl;
+                  << ",\"fps\":" << webcamCapture.fps()
+                  << ",\"deviceName\":\"" << jsonEscape(wideToUtf8(webcamCapture.selectedDeviceName()))
+                  << "\"}" << std::endl;
     }
 
     WasapiLoopbackCapture loopbackCapture;
diff --git a/electron/native/wgc-capture/src/webcam_capture.cpp b/electron/native/wgc-capture/src/webcam_capture.cpp
index 6b34a35c2..708d72c56 100644
--- a/electron/native/wgc-capture/src/webcam_capture.cpp
+++ b/electron/native/wgc-capture/src/webcam_capture.cpp
@@ -51,20 +51,25 @@ WebcamCapture::~WebcamCapture() {
     stop();
 }
 
-bool WebcamCapture::initialize(const std::wstring& deviceId, int requestedWidth, int requestedHeight, int requestedFps) {
+bool WebcamCapture::initialize(
+    const std::wstring& deviceId,
+    const std::wstring& deviceName,
+    int requestedWidth,
+    int requestedHeight,
+    int requestedFps) {
     fps_ = std::clamp(requestedFps > 0 ? requestedFps : 30, 1, 60);
     if (!succeeded(MFStartup(MF_VERSION), "MFStartup(webcam)")) {
         return false;
     }
     mfStarted_ = true;
-    if (!selectDevice(deviceId)) {
+    if (!selectDevice(deviceId, deviceName)) {
         return false;
     }
 
     return configureReader(requestedWidth, requestedHeight, fps_);
 }
 
-bool WebcamCapture::selectDevice(const std::wstring& deviceId) {
+bool WebcamCapture::selectDevice(const std::wstring& deviceId, const std::wstring& deviceName) {
     Microsoft::WRL::ComPtr<IMFAttributes> attributes;
     if (!succeeded(MFCreateAttributes(&attributes, 1), "MFCreateAttributes(webcam enumeration)")) {
         return false;
@@ -88,22 +93,32 @@ bool WebcamCapture::selectDevice(const std::wstring& deviceId) {
     }
 
     UINT32 selectedIndex = 0;
+    bool matched = false;
+    auto matchesRequestedDevice = [&](const std::wstring& name, const std::wstring& symbolicLink) {
+        if (!deviceName.empty() &&
+            (containsInsensitive(name, deviceName) || containsInsensitive(symbolicLink, deviceName))) {
+            return true;
+        }
+        if (!deviceId.empty() &&
+            (containsInsensitive(symbolicLink, deviceId) || containsInsensitive(name, deviceId))) {
+            return true;
+        }
+        return false;
+    };
+
     for (UINT32 index = 0; index < deviceCount; index += 1) {
         const std::wstring name = readAllocatedString(devices[index], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
         const std::wstring symbolicLink = readAllocatedString(devices[index], MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK);
-        if (!deviceId.empty() && (containsInsensitive(symbolicLink, deviceId) || containsInsensitive(name, deviceId))) {
+        if (matchesRequestedDevice(name, symbolicLink)) {
             selectedIndex = index;
+            matched = true;
             break;
         }
     }
 
-    if (!deviceId.empty() && selectedIndex == 0) {
-        const std::wstring firstName = readAllocatedString(devices[0], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
-        const std::wstring firstLink = readAllocatedString(devices[0], MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK);
-        if (!containsInsensitive(firstLink, deviceId) && !containsInsensitive(firstName, deviceId)) {
-            std::cerr << "WARNING: Requested webcam device was not found by Media Foundation; using default webcam"
-                      << std::endl;
-        }
+    if ((!deviceId.empty() || !deviceName.empty()) && !matched) {
+        std::cerr << "WARNING: Requested webcam device was not found by Media Foundation; using default webcam"
+                  << std::endl;
     }
 
     selectedDeviceName_ = readAllocatedString(devices[selectedIndex], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
diff --git a/electron/native/wgc-capture/src/webcam_capture.h b/electron/native/wgc-capture/src/webcam_capture.h
index 7d5f90439..201db2598 100644
--- a/electron/native/wgc-capture/src/webcam_capture.h
+++ b/electron/native/wgc-capture/src/webcam_capture.h
@@ -20,7 +20,12 @@ class WebcamCapture {
     WebcamCapture(const WebcamCapture&) = delete;
     WebcamCapture& operator=(const WebcamCapture&) = delete;
 
-    bool initialize(const std::wstring& deviceId, int requestedWidth, int requestedHeight, int requestedFps);
+    bool initialize(
+        const std::wstring& deviceId,
+        const std::wstring& deviceName,
+        int requestedWidth,
+        int requestedHeight,
+        int requestedFps);
     bool start();
     void stop();
     bool copyLatestFrame(std::vector<BYTE>& destination, int& width, int& height);
@@ -31,7 +36,7 @@ class WebcamCapture {
     const std::wstring& selectedDeviceName() const;
 
 private:
-    bool selectDevice(const std::wstring& deviceId);
+    bool selectDevice(const std::wstring& deviceId, const std::wstring& deviceName);
     bool configureReader(int requestedWidth, int requestedHeight, int requestedFps);
     void captureLoop();
 
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index 3bdba5752..3f9fb930c 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -190,6 +190,7 @@ const config = {
 	microphoneGain: 1.4,
 	webcamEnabled: WITH_WEBCAM,
 	webcamDeviceId: process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_ID ?? "",
+	webcamDeviceName: process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME ?? "",
 	webcamWidth: 640,
 	webcamHeight: 360,
 	webcamFps: 30,
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 96e6bd955..1de1b3841 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -107,6 +107,7 @@ export function LaunchWindow() {
 		setWebcamEnabled,
 		webcamDeviceId,
 		setWebcamDeviceId,
+		setWebcamDeviceName,
 	} = useScreenRecorder();
 
 	const showMicControls = microphoneEnabled && !recording;
@@ -148,14 +149,16 @@ export function LaunchWindow() {
 	const selectedMicLabel =
 		micDevices.find((d) => d.deviceId === (microphoneDeviceId || selectedMicId))?.label ||
 		t("audio.defaultMicrophone");
+	const selectedCameraDevice = cameraDevices.find(
+		(d) => d.deviceId === (webcamDeviceId || selectedCameraId),
+	);
 	const selectedCameraLabel = isCameraDevicesLoading
 		? t("webcam.searching")
 		: cameraDevicesError
 			? t("webcam.unavailable")
 			: cameraDevices.length === 0
 				? t("webcam.noneFound")
-				: cameraDevices.find((d) => d.deviceId === (webcamDeviceId || selectedCameraId))?.label ||
-					t("webcam.defaultCamera");
+				: selectedCameraDevice?.label || t("webcam.defaultCamera");
 
 	const { level } = useAudioLevelMeter({
 		enabled: showMicControls,
@@ -171,8 +174,9 @@ export function LaunchWindow() {
 	useEffect(() => {
 		if (selectedCameraId) {
 			setWebcamDeviceId(selectedCameraId);
+			setWebcamDeviceName(cameraDevices.find((d) => d.deviceId === selectedCameraId)?.label);
 		}
-	}, [selectedCameraId, setWebcamDeviceId]);
+	}, [selectedCameraId, cameraDevices, setWebcamDeviceId, setWebcamDeviceName]);
 
 	useEffect(() => {
 		if (!import.meta.env.DEV) {
@@ -446,8 +450,12 @@ export function LaunchWindow() {
 											<select
 												value={webcamDeviceId || selectedCameraId}
 												onChange={(e) => {
+													const device = cameraDevices.find(
+														(item) => item.deviceId === e.target.value,
+													);
 													setSelectedCameraId(e.target.value);
 													setWebcamDeviceId(e.target.value);
+													setWebcamDeviceName(device?.label);
 												}}
 												className="w-full appearance-none bg-white/5 text-white text-[11px] rounded-lg pl-2 pr-6 py-1 border border-white/10 outline-none hover:bg-white/10 transition-colors cursor-pointer"
 											>
@@ -471,8 +479,10 @@ export function LaunchWindow() {
 									<select
 										value={webcamDeviceId || selectedCameraId}
 										onChange={(e) => {
+											const device = cameraDevices.find((item) => item.deviceId === e.target.value);
 											setSelectedCameraId(e.target.value);
 											setWebcamDeviceId(e.target.value);
+											setWebcamDeviceName(device?.label);
 										}}
 										className="sr-only"
 									>
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 394795474..1496acdaf 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -55,6 +55,8 @@ type UseScreenRecorderReturn = {
 	setMicrophoneDeviceId: (deviceId: string | undefined) => void;
 	webcamDeviceId: string | undefined;
 	setWebcamDeviceId: (deviceId: string | undefined) => void;
+	webcamDeviceName: string | undefined;
+	setWebcamDeviceName: (deviceName: string | undefined) => void;
 	systemAudioEnabled: boolean;
 	setSystemAudioEnabled: (enabled: boolean) => void;
 	webcamEnabled: boolean;
@@ -101,6 +103,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const [microphoneEnabled, setMicrophoneEnabled] = useState(false);
 	const [microphoneDeviceId, setMicrophoneDeviceId] = useState<string | undefined>(undefined);
 	const [webcamDeviceId, setWebcamDeviceId] = useState<string | undefined>(undefined);
+	const [webcamDeviceName, setWebcamDeviceName] = useState<string | undefined>(undefined);
 	const [systemAudioEnabled, setSystemAudioEnabled] = useState(false);
 	const [webcamEnabled, setWebcamEnabledState] = useState(false);
 	const screenRecorder = useRef<RecorderHandle | null>(null);
@@ -620,6 +623,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 				webcam: {
 					enabled: webcamEnabled,
 					deviceId: webcamDeviceId,
+					deviceName: webcamDeviceName,
 					width: WEBCAM_TARGET_WIDTH,
 					height: WEBCAM_TARGET_HEIGHT,
 					fps: WEBCAM_TARGET_FRAME_RATE,
@@ -1123,6 +1127,8 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		setMicrophoneDeviceId,
 		webcamDeviceId,
 		setWebcamDeviceId,
+		webcamDeviceName,
+		setWebcamDeviceName,
 		systemAudioEnabled,
 		setSystemAudioEnabled,
 		webcamEnabled,
diff --git a/src/lib/nativeWindowsRecording.ts b/src/lib/nativeWindowsRecording.ts
index 7e2f0bac1..59de0be73 100644
--- a/src/lib/nativeWindowsRecording.ts
+++ b/src/lib/nativeWindowsRecording.ts
@@ -26,6 +26,7 @@ export type NativeWindowsRecordingRequest = {
 	webcam: {
 		enabled: boolean;
 		deviceId?: string;
+		deviceName?: string;
 		width: number;
 		height: number;
 		fps: number;

From 6d859cca13bc6bd22c5310dcd2b4034c838aabdd Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 18:33:48 +0200
Subject: [PATCH 17/38] fix: support DirectShow virtual webcams

---
 .../windows-native-recorder-roadmap.md        |   3 +
 electron/ipc/handlers.ts                      | 122 +++++
 electron/native/README.md                     |   2 +-
 electron/native/wgc-capture/CMakeLists.txt    |   2 +
 .../wgc-capture/src/dshow_webcam_capture.cpp  | 469 ++++++++++++++++++
 .../wgc-capture/src/dshow_webcam_capture.h    |  50 ++
 electron/native/wgc-capture/src/main.cpp      |   3 +
 .../native/wgc-capture/src/webcam_capture.cpp | 163 +++++-
 .../native/wgc-capture/src/webcam_capture.h   |   6 +
 scripts/test-windows-wgc-helper.mjs           |  73 +++
 src/lib/nativeWindowsRecording.ts             |   1 +
 11 files changed, 875 insertions(+), 19 deletions(-)
 create mode 100644 electron/native/wgc-capture/src/dshow_webcam_capture.cpp
 create mode 100644 electron/native/wgc-capture/src/dshow_webcam_capture.h

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index 12c950201..512915382 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -40,6 +40,7 @@ The helper owns Windows media capture:
 - WASAPI system loopback;
 - WASAPI microphone input;
 - Media Foundation webcam capture;
+- DirectShow webcam fallback for virtual cameras not visible to Media Foundation;
 - Media Foundation encoding/muxing;
 - stream timestamp normalization.
 
@@ -135,6 +136,7 @@ SSOT rules for this phase:
 - `WgcSession::captureWidth()/captureHeight()` is the encoded screen frame size until a dedicated native scaling stage exists.
 - `WasapiLoopbackCapture::inputFormat()` is the runtime audio format source used by `MFEncoder`.
 - The renderer passes both the browser webcam `deviceId` and selected display label as `deviceName`; `electron/native/wgc-capture/src/webcam_capture.*` is the only place that maps those values to Media Foundation devices.
+- Electron resolves the selected label to a DirectShow filter CLSID once and passes it as `webcamDirectShowClsid`; the helper must not independently guess among DirectShow filters.
 - No duplicated hard-coded audio format assumptions in `main.cpp`.
 
 ### 3. WASAPI Microphone
@@ -158,6 +160,7 @@ Acceptance:
 - Convert webcam samples to BGRA and compose them into the primary helper MP4 as an initial bottom-right picture-in-picture overlay.
 - Keep the helper process as the SSOT for screen/window, WASAPI system audio, microphone, webcam, and mux timing.
 - Match the requested webcam through Media Foundation friendly names first, then browser device ids/symbolic links, so UI selection remains stable across Chromium and Windows native device namespaces.
+- Use the Electron-resolved DirectShow CLSID when the selected virtual camera, for example NVIDIA Broadcast, is registered for DirectShow but absent from Media Foundation enumeration.
 - Later: promote the same webcam capture source to a separate editable native `webcamVideoPath` if product requirements need post-recording layout edits.
 
 Acceptance:
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 768305e57..ae9ba0808 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -474,6 +474,103 @@ function isWindowsGraphicsCaptureOsSupported() {
 	return Number.isFinite(build) && build >= 19041;
 }
 
+function normalizeNativeDeviceName(value: string) {
+	return value
+		.toLowerCase()
+		.replace(/[^a-z0-9]+/g, " ")
+		.trim();
+}
+
+function scoreNativeDeviceName(candidateName: string, candidateId: string, requestedName?: string) {
+	const candidate = normalizeNativeDeviceName(candidateName);
+	const id = normalizeNativeDeviceName(candidateId);
+	const requested = normalizeNativeDeviceName(requestedName ?? "");
+	if (!requested) {
+		return 0;
+	}
+	if (candidate === requested) {
+		return 1000;
+	}
+	if (candidate.includes(requested) || requested.includes(candidate)) {
+		return 900;
+	}
+	if (id.includes(requested) || requested.includes(id)) {
+		return 800;
+	}
+
+	return requested
+		.split(/\s+/)
+		.filter((word) => word.length > 1 && !["camera", "webcam", "video", "input"].includes(word))
+		.reduce((score, word) => {
+			if (candidate.includes(word)) return score + 100;
+			if (id.includes(word)) return score + 50;
+			return score;
+		}, 0);
+}
+
+function queryDirectShowVideoInputRegistry() {
+	return new Promise<string>((resolve) => {
+		const proc = spawn(
+			"reg.exe",
+			["query", "HKCR\\CLSID\\{860BB310-5D01-11D0-BD3B-00A0C911CE86}\\Instance", "/s"],
+			{ windowsHide: true },
+		);
+		let stdout = "";
+		proc.stdout.on("data", (chunk: Buffer) => {
+			stdout += chunk.toString("utf16le").includes("\u0000")
+				? chunk.toString("utf16le")
+				: chunk.toString();
+		});
+		proc.on("close", () => resolve(stdout));
+		proc.on("error", () => resolve(""));
+	});
+}
+
+async function resolveDirectShowWebcamClsid(deviceName?: string) {
+	if (process.platform !== "win32" || !deviceName?.trim()) {
+		return null;
+	}
+
+	const output = await queryDirectShowVideoInputRegistry();
+	let current: { friendlyName?: string; clsid?: string } = {};
+	const entries: Array<{ friendlyName?: string; clsid?: string }> = [];
+	for (const rawLine of output.split(/\r?\n/)) {
+		const line = rawLine.trim();
+		if (!line) continue;
+		if (/^HKEY_/i.test(line)) {
+			if (current.friendlyName || current.clsid) entries.push(current);
+			current = {};
+			continue;
+		}
+		const match = line.match(/^(\S+)\s+REG_SZ\s+(.+)$/);
+		if (!match) continue;
+		if (match[1] === "FriendlyName") current.friendlyName = match[2].trim();
+		if (match[1] === "CLSID") current.clsid = match[2].trim();
+	}
+	if (current.friendlyName || current.clsid) entries.push(current);
+
+	let best: { clsid: string; friendlyName?: string; score: number } | null = null;
+	for (const entry of entries) {
+		if (!entry.clsid) continue;
+		const score = scoreNativeDeviceName(entry.friendlyName ?? "", entry.clsid, deviceName);
+		if (!best || score > best.score) {
+			best = { clsid: entry.clsid, friendlyName: entry.friendlyName, score };
+		}
+	}
+
+	if (!best || best.score <= 0) {
+		return null;
+	}
+
+	console.info("[native-wgc] resolved DirectShow webcam filter", {
+		requestedName: deviceName,
+		filterName: best.friendlyName,
+		clsid: best.clsid,
+		score: best.score,
+	});
+	return best.clsid;
+}
+
 async function startCursorRecording(recordingId?: number) {
 	if (cursorRecordingSession) {
 		pendingCursorRecordingData = await cursorRecordingSession.stop();
@@ -621,6 +718,25 @@ function waitForNativeWindowsCaptureStop(proc: ChildProcessWithoutNullStreams) {
 	});
 }
 
+function readNativeWindowsWebcamFormat(output: string) {
+	const lines = output.split(/\r?\n/).filter((line) => line.includes('"event":"webcam-format"'));
+	const lastLine = lines.at(-1);
+	if (!lastLine) {
+		return null;
+	}
+
+	try {
+		return JSON.parse(lastLine) as {
+			width?: number;
+			height?: number;
+			fps?: number;
+			deviceName?: string;
+		};
+	} catch {
+		return null;
+	}
+}
+
 function setCurrentRecordingSessionState(session: RecordingSession | null) {
 	currentRecordingSession = session;
 	currentVideoPath = session?.screenVideoPath ?? null;
@@ -822,6 +938,9 @@ export function registerIpcHandlers(
 					typeof request.source.displayId === "number" && Number.isFinite(request.source.displayId)
 						? request.source.displayId
 						: Number(selectedSource?.display_id);
+				const webcamDirectShowClsid = request.webcam.enabled
+					? await resolveDirectShowWebcamClsid(request.webcam.deviceName)
+					: null;
 				const config = {
 					schemaVersion: 2,
 					recordingId,
@@ -845,6 +964,7 @@ export function registerIpcHandlers(
 					webcamEnabled: request.webcam.enabled,
 					webcamDeviceId: request.webcam.deviceId ?? null,
 					webcamDeviceName: request.webcam.deviceName ?? null,
+					webcamDirectShowClsid,
 					webcamWidth: request.webcam.width,
 					webcamHeight: request.webcam.height,
 					webcamFps: request.webcam.fps,
@@ -899,9 +1019,11 @@ export function registerIpcHandlers(
 				await waitForNativeWindowsCaptureStart(proc);
 				const captureStartedAtMs = Date.now();
 				nativeWindowsCursorOffsetMs = Math.max(0, captureStartedAtMs - cursorStartTimeMs);
+				const webcamFormat = readNativeWindowsWebcamFormat(nativeWindowsCaptureOutput);
 				console.info("[native-wgc] capture started", {
 					captureStartedAtMs,
 					cursorOffsetMs: nativeWindowsCursorOffsetMs,
+					webcamFormat,
 				});
 
 				const source = selectedSource || { name: "Screen" };
diff --git a/electron/native/README.md b/electron/native/README.md
index 844f79c7b..8b3590d2e 100644
--- a/electron/native/README.md
+++ b/electron/native/README.md
@@ -47,7 +47,7 @@ Current V2 JSON shape:
 }
 ```
 
-The current helper implementation supports display/window video capture, system audio loopback, default-microphone capture, and Media Foundation webcam capture. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links, so the renderer passes both `webcamDeviceId` and `webcamDeviceName`. The helper treats the Media Foundation friendly name as the preferred stable selector, then tries the browser id, and only falls back to the default webcam with an explicit warning when no requested device matches.
+The current helper implementation supports display/window video capture, system audio loopback, default-microphone capture, Media Foundation webcam capture, and a DirectShow webcam fallback for virtual cameras that are not exposed through Media Foundation. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links, so the renderer passes both `webcamDeviceId` and `webcamDeviceName`. Electron resolves a matching DirectShow filter CLSID for the selected label; the helper uses Media Foundation first, then that exact DirectShow filter when the requested camera is absent from Media Foundation.
 
 Smoke-test the helper with:
 
diff --git a/electron/native/wgc-capture/CMakeLists.txt b/electron/native/wgc-capture/CMakeLists.txt
index 92b93357d..750365816 100644
--- a/electron/native/wgc-capture/CMakeLists.txt
+++ b/electron/native/wgc-capture/CMakeLists.txt
@@ -16,6 +16,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 add_executable(wgc-capture
   src/audio_sample_utils.cpp
   src/audio_sample_utils.h
+  src/dshow_webcam_capture.cpp
+  src/dshow_webcam_capture.h
   src/main.cpp
   src/mf_encoder.cpp
   src/mf_encoder.h
diff --git a/electron/native/wgc-capture/src/dshow_webcam_capture.cpp b/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
new file mode 100644
index 000000000..535bf7ee9
--- /dev/null
+++ b/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
@@ -0,0 +1,469 @@
+#include "dshow_webcam_capture.h"
+
+#include <initguid.h>
+#include <dshow.h>
+#include <wrl/client.h>
+
+#include <algorithm>
+#include <chrono>
+#include <cwctype>
+#include <iostream>
+
+namespace {
+
+const CLSID CLSID_SampleGrabberLocal = {0xC1F400A0, 0x3F08, 0x11D3, {0x9F, 0x0B, 0x00, 0x60, 0x08, 0x03, 0x9E, 0x37}};
+const CLSID CLSID_NullRendererLocal = {0xC1F400A4, 0x3F08, 0x11D3, {0x9F, 0x0B, 0x00, 0x60, 0x08, 0x03, 0x9E, 0x37}};
+
+MIDL_INTERFACE("0579154A-2B53-4994-B0D0-E773148EFF85")
+ISampleGrabberCB : public IUnknown {
+public:
+    virtual HRESULT STDMETHODCALLTYPE SampleCB(double sampleTime, IMediaSample* sample) = 0;
+    virtual HRESULT STDMETHODCALLTYPE BufferCB(double sampleTime, BYTE* buffer, long bufferLength) = 0;
+};
+
+MIDL_INTERFACE("6B652FFF-11FE-4FCE-92AD-0266B5D7C78F")
+ISampleGrabber : public IUnknown {
+public:
+    virtual HRESULT STDMETHODCALLTYPE SetOneShot(BOOL oneShot) = 0;
+    virtual HRESULT STDMETHODCALLTYPE SetMediaType(const AM_MEDIA_TYPE* type) = 0;
+    virtual HRESULT STDMETHODCALLTYPE GetConnectedMediaType(AM_MEDIA_TYPE* type) = 0;
+    virtual HRESULT STDMETHODCALLTYPE SetBufferSamples(BOOL bufferThem) = 0;
+    virtual HRESULT STDMETHODCALLTYPE GetCurrentBuffer(long* bufferSize, long* buffer) = 0;
+    virtual HRESULT STDMETHODCALLTYPE GetCurrentSample(IMediaSample** sample) = 0;
+    virtual HRESULT STDMETHODCALLTYPE SetCallback(ISampleGrabberCB* callback, long whichMethodToCallback) = 0;
+};
+
+bool succeeded(HRESULT hr, const char* label) {
+    if (SUCCEEDED(hr)) {
+        return true;
+    }
+
+    std::cerr << "ERROR: " << label << " failed (hr=0x" << std::hex << hr << std::dec << ")"
+              << std::endl;
+    return false;
+}
+
+std::wstring readPropertyString(IPropertyBag* bag, LPCOLESTR key) {
+    VARIANT value;
+    VariantInit(&value);
+    if (FAILED(bag->Read(key, &value, nullptr)) || value.vt != VT_BSTR || !value.bstrVal) {
+        VariantClear(&value);
+        return {};
+    }
+
+    std::wstring result(value.bstrVal);
+    VariantClear(&value);
+    return result;
+}
+
+bool containsInsensitive(const std::wstring& haystack, const std::wstring& needle) {
+    if (haystack.empty() || needle.empty()) {
+        return false;
+    }
+
+    std::wstring lowerHaystack = haystack;
+    std::wstring lowerNeedle = needle;
+    std::transform(lowerHaystack.begin(), lowerHaystack.end(), lowerHaystack.begin(), ::towlower);
+    std::transform(lowerNeedle.begin(), lowerNeedle.end(), lowerNeedle.begin(), ::towlower);
+    return lowerHaystack.find(lowerNeedle) != std::wstring::npos ||
+        lowerNeedle.find(lowerHaystack) != std::wstring::npos;
+}
+
+std::wstring normalizeDeviceName(const std::wstring& value) {
+    std::wstring normalized;
+    normalized.reserve(value.size());
+    bool lastWasSpace = true;
+    for (const wchar_t ch : value) {
+        if (std::iswalnum(ch)) {
+            normalized.push_back(static_cast<wchar_t>(std::towlower(ch)));
+            lastWasSpace = false;
+            continue;
+        }
+        if (!lastWasSpace) {
+            normalized.push_back(L' ');
+            lastWasSpace = true;
+        }
+    }
+    while (!normalized.empty() && normalized.back() == L' ') {
+        normalized.pop_back();
+    }
+    return normalized;
+}
+
+std::vector<std::wstring> splitWords(const std::wstring& value) {
+    std::vector<std::wstring> words;
+    size_t start = 0;
+    while (start < value.size()) {
+        const size_t end = value.find(L' ', start);
+        const auto word = value.substr(start, end == std::wstring::npos ? std::wstring::npos : end - start);
+        if (word.size() > 1 && word != L"camera" && word != L"webcam" && word != L"video" && word != L"input") {
+            words.push_back(word);
+        }
+        if (end == std::wstring::npos) {
+            break;
+        }
+        start = end + 1;
+    }
+    return words;
+}
+
+int deviceMatchScore(
+    const std::wstring& candidateName,
+    const std::wstring& candidatePath,
+    const std::wstring& requestedName,
+    const std::wstring& requestedId) {
+    int score = 0;
+    const auto normalizedName = normalizeDeviceName(candidateName);
+    const auto normalizedPath = normalizeDeviceName(candidatePath);
+    const auto normalizedRequestedName = normalizeDeviceName(requestedName);
+    const auto normalizedRequestedId = normalizeDeviceName(requestedId);
+
+    if (!normalizedRequestedName.empty()) {
+        if (normalizedName == normalizedRequestedName) {
+            score = std::max(score, 1000);
+        }
+        if (containsInsensitive(normalizedName, normalizedRequestedName)) {
+            score = std::max(score, 900);
+        }
+        if (containsInsensitive(normalizedPath, normalizedRequestedName)) {
+            score = std::max(score, 800);
+        }
+
+        int wordScore = 0;
+        for (const auto& word : splitWords(normalizedRequestedName)) {
+            if (normalizedName.find(word) != std::wstring::npos) {
+                wordScore += 100;
+            } else if (normalizedPath.find(word) != std::wstring::npos) {
+                wordScore += 50;
+            }
+        }
+        score = std::max(score, wordScore);
+    }
+
+    if (!normalizedRequestedId.empty()) {
+        if (containsInsensitive(normalizedPath, normalizedRequestedId)) {
+            score = std::max(score, 700);
+        }
+        if (containsInsensitive(normalizedName, normalizedRequestedId)) {
+            score = std::max(score, 600);
+        }
+    }
+
+    return score;
+}
+
+void freeMediaType(AM_MEDIA_TYPE& type) {
+    if (type.cbFormat != 0) {
+        CoTaskMemFree(type.pbFormat);
+        type.cbFormat = 0;
+        type.pbFormat = nullptr;
+    }
+    if (type.pUnk) {
+        type.pUnk->Release();
+        type.pUnk = nullptr;
+    }
+}
+
+bool readRegistryString(HKEY key, const wchar_t* valueName, std::wstring& value) {
+    DWORD type = 0;
+    DWORD size = 0;
+    if (RegGetValueW(key, nullptr, valueName, RRF_RT_REG_SZ, &type, nullptr, &size) != ERROR_SUCCESS || size == 0) {
+        return false;
+    }
+
+    std::wstring buffer(size / sizeof(wchar_t), L'\0');
+    if (RegGetValueW(key, nullptr, valueName, RRF_RT_REG_SZ, &type, buffer.data(), &size) != ERROR_SUCCESS) {
+        return false;
+    }
+    while (!buffer.empty() && buffer.back() == L'\0') {
+        buffer.pop_back();
+    }
+    value = buffer;
+    return true;
+}
+
+bool findRegisteredVideoInput(
+    const std::wstring& deviceId,
+    const std::wstring& deviceName,
+    CLSID& selectedClsid,
+    std::wstring& selectedName,
+    int& bestScore) {
+    HKEY instanceKey = nullptr;
+    if (RegOpenKeyExW(
+            HKEY_CLASSES_ROOT,
+            L"CLSID\\{860BB310-5D01-11D0-BD3B-00A0C911CE86}\\Instance",
+            0,
+            KEY_READ,
+            &instanceKey) != ERROR_SUCCESS) {
+        return false;
+    }
+
+    DWORD index = 0;
+    wchar_t subkeyName[128];
+    DWORD subkeyNameLength = ARRAYSIZE(subkeyName);
+    bool found = false;
+    while (RegEnumKeyExW(instanceKey, index, subkeyName, &subkeyNameLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS) {
+        HKEY filterKey = nullptr;
+        if (RegOpenKeyExW(instanceKey, subkeyName, 0, KEY_READ, &filterKey) == ERROR_SUCCESS) {
+            std::wstring friendlyName;
+            std::wstring clsidText;
+            readRegistryString(filterKey, L"FriendlyName", friendlyName);
+            readRegistryString(filterKey, L"CLSID", clsidText);
+            const int score = deviceMatchScore(friendlyName, clsidText, deviceName, deviceId);
+            std::wcerr << L"INFO: Registered DirectShow webcam candidate name=\"" << friendlyName << L"\" score=" << score << std::endl;
+            CLSID clsid{};
+            if (!clsidText.empty() && SUCCEEDED(CLSIDFromString(clsidText.c_str(), &clsid)) && (!found || score > bestScore)) {
+                selectedClsid = clsid;
+                selectedName = friendlyName;
+                bestScore = score;
+                found = true;
+            }
+            RegCloseKey(filterKey);
+        }
+        index += 1;
+        subkeyNameLength = ARRAYSIZE(subkeyName);
+    }
+
+    RegCloseKey(instanceKey);
+    return found;
+}
+
+} // namespace
+
+struct DirectShowWebcamCapture::Impl {
+    Microsoft::WRL::ComPtr<IGraphBuilder> graph;
+    Microsoft::WRL::ComPtr<ICaptureGraphBuilder2> captureGraph;
+    Microsoft::WRL::ComPtr<IBaseFilter> captureFilter;
+    Microsoft::WRL::ComPtr<IBaseFilter> sampleGrabberFilter;
+    Microsoft::WRL::ComPtr<ISampleGrabber> sampleGrabber;
+    Microsoft::WRL::ComPtr<IBaseFilter> nullRenderer;
+    Microsoft::WRL::ComPtr<IMediaControl> mediaControl;
+    bool comInitialized = false;
+    bool running = false;
+};
+
+DirectShowWebcamCapture::~DirectShowWebcamCapture() {
+    stop();
+    delete impl_;
+}
+
+bool DirectShowWebcamCapture::initialize(
+    const std::wstring& deviceId,
+    const std::wstring& deviceName,
+    const std::wstring& directShowClsid,
+    int requestedWidth,
+    int requestedHeight,
+    int requestedFps) {
+    stop();
+    delete impl_;
+    impl_ = new Impl();
+    fps_ = std::clamp(requestedFps > 0 ? requestedFps : 30, 1, 60);
+
+    HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+    if (SUCCEEDED(hr)) {
+        impl_->comInitialized = true;
+    } else if (hr != RPC_E_CHANGED_MODE) {
+        return succeeded(hr, "CoInitializeEx(DirectShow webcam)");
+    }
+
+    if (directShowClsid.empty()) {
+        std::cerr << "ERROR: DirectShow webcam fallback requires a resolved filter CLSID" << std::endl;
+        return false;
+    }
+
+    CLSID selectedClsid{};
+    if (FAILED(CLSIDFromString(directShowClsid.c_str(), &selectedClsid))) {
+        std::cerr << "ERROR: DirectShow webcam fallback received an invalid filter CLSID" << std::endl;
+        return false;
+    }
+    selectedDeviceName_ = deviceName.empty() ? directShowClsid : deviceName;
+
+    if (!succeeded(CoCreateInstance(selectedClsid, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&impl_->captureFilter)),
+                   "CoCreateInstance(DirectShow webcam filter)")) {
+        return false;
+    }
+    if (!succeeded(CoCreateInstance(CLSID_FilterGraph, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&impl_->graph)),
+                   "CoCreateInstance(FilterGraph)")) {
+        return false;
+    }
+    if (!succeeded(CoCreateInstance(CLSID_CaptureGraphBuilder2, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&impl_->captureGraph)),
+                   "CoCreateInstance(CaptureGraphBuilder2)")) {
+        return false;
+    }
+    if (!succeeded(impl_->captureGraph->SetFiltergraph(impl_->graph.Get()), "SetFiltergraph(DirectShow webcam)")) {
+        return false;
+    }
+    if (!succeeded(impl_->graph->AddFilter(impl_->captureFilter.Get(), L"OpenScreen Webcam Source"),
+                   "AddFilter(DirectShow webcam source)")) {
+        return false;
+    }
+
+    if (!succeeded(CoCreateInstance(CLSID_SampleGrabberLocal, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&impl_->sampleGrabberFilter)),
+                   "CoCreateInstance(SampleGrabber)")) {
+        return false;
+    }
+    if (!succeeded(impl_->sampleGrabberFilter.As(&impl_->sampleGrabber), "QueryInterface(ISampleGrabber)")) {
+        return false;
+    }
+
+    AM_MEDIA_TYPE requestedType{};
+    requestedType.majortype = MEDIATYPE_Video;
+    requestedType.subtype = MEDIASUBTYPE_RGB32;
+    requestedType.formattype = FORMAT_VideoInfo;
+    if (!succeeded(impl_->sampleGrabber->SetMediaType(&requestedType), "SetMediaType(DirectShow RGB32)")) {
+        return false;
+    }
+
+    if (!succeeded(impl_->graph->AddFilter(impl_->sampleGrabberFilter.Get(), L"OpenScreen Webcam Sample Grabber"),
+                   "AddFilter(SampleGrabber)")) {
+        return false;
+    }
+    if (!succeeded(CoCreateInstance(CLSID_NullRendererLocal, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&impl_->nullRenderer)),
+                   "CoCreateInstance(NullRenderer)")) {
+        return false;
+    }
+    if (!succeeded(impl_->graph->AddFilter(impl_->nullRenderer.Get(), L"OpenScreen Webcam Null Renderer"),
+                   "AddFilter(NullRenderer)")) {
+        return false;
+    }
+
+    if (!succeeded(impl_->captureGraph->RenderStream(
+            &PIN_CATEGORY_CAPTURE,
+            &MEDIATYPE_Video,
+            impl_->captureFilter.Get(),
+            impl_->sampleGrabberFilter.Get(),
+            impl_->nullRenderer.Get()),
+            "RenderStream(DirectShow webcam)")) {
+        return false;
+    }
+
+    AM_MEDIA_TYPE connectedType{};
+    if (!succeeded(impl_->sampleGrabber->GetConnectedMediaType(&connectedType), "GetConnectedMediaType(DirectShow webcam)")) {
+        return false;
+    }
+    if (connectedType.formattype == FORMAT_VideoInfo && connectedType.pbFormat) {
+        const auto* videoInfo = reinterpret_cast<VIDEOINFOHEADER*>(connectedType.pbFormat);
+        width_ = std::abs(videoInfo->bmiHeader.biWidth);
+        height_ = std::abs(videoInfo->bmiHeader.biHeight);
+        sourceTopDown_ = videoInfo->bmiHeader.biHeight < 0;
+    }
+    freeMediaType(connectedType);
+    if (width_ <= 0 || height_ <= 0) {
+        width_ = requestedWidth > 0 ? requestedWidth : 1280;
+        height_ = requestedHeight > 0 ? requestedHeight : 720;
+    }
+
+    impl_->sampleGrabber->SetBufferSamples(TRUE);
+    impl_->sampleGrabber->SetOneShot(FALSE);
+    if (!succeeded(impl_->graph.As(&impl_->mediaControl), "QueryInterface(IMediaControl)")) {
+        return false;
+    }
+
+    return true;
+}
+
+bool DirectShowWebcamCapture::start() {
+    if (!impl_ || !impl_->mediaControl || impl_->running) {
+        return false;
+    }
+    HRESULT hr = impl_->mediaControl->Run();
+    if (!succeeded(hr, "Run(DirectShow webcam)")) {
+        return false;
+    }
+    impl_->running = true;
+    stopRequested_ = false;
+    thread_ = std::thread(&DirectShowWebcamCapture::captureLoop, this);
+    return true;
+}
+
+void DirectShowWebcamCapture::stop() {
+    stopRequested_ = true;
+    if (thread_.joinable()) {
+        thread_.join();
+    }
+    if (!impl_) {
+        return;
+    }
+    if (impl_->mediaControl && impl_->running) {
+        impl_->mediaControl->Stop();
+    }
+    impl_->running = false;
+    impl_->mediaControl.Reset();
+    impl_->nullRenderer.Reset();
+    impl_->sampleGrabber.Reset();
+    impl_->sampleGrabberFilter.Reset();
+    impl_->captureFilter.Reset();
+    impl_->captureGraph.Reset();
+    impl_->graph.Reset();
+    if (impl_->comInitialized) {
+        CoUninitialize();
+        impl_->comInitialized = false;
+    }
+}
+
+void DirectShowWebcamCapture::captureLoop() {
+    CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+    while (!stopRequested_ && impl_ && impl_->sampleGrabber) {
+        long bufferSize = 0;
+        HRESULT hr = impl_->sampleGrabber->GetCurrentBuffer(&bufferSize, nullptr);
+        if (SUCCEEDED(hr) && bufferSize > 0) {
+            std::vector<BYTE> buffer(static_cast<size_t>(bufferSize));
+            hr = impl_->sampleGrabber->GetCurrentBuffer(&bufferSize, reinterpret_cast<long*>(buffer.data()));
+            if (SUCCEEDED(hr)) {
+                storeFrame(buffer.data(), bufferSize);
+            }
+        }
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000 / std::max(1, fps_)));
+    }
+    CoUninitialize();
+}
+
+void DirectShowWebcamCapture::storeFrame(const BYTE* buffer, long length) {
+    const int stride = width_ * 4;
+    const int expectedLength = stride * height_;
+    if (!buffer || length < expectedLength || width_ <= 0 || height_ <= 0) {
+        return;
+    }
+
+    std::vector<BYTE> frame(static_cast<size_t>(expectedLength));
+    for (int y = 0; y < height_; y += 1) {
+        const int sourceY = sourceTopDown_ ? y : height_ - 1 - y;
+        const BYTE* source = buffer + sourceY * stride;
+        BYTE* destination = frame.data() + y * stride;
+        std::copy(source, source + stride, destination);
+        for (int x = 0; x < width_; x += 1) {
+            destination[x * 4 + 3] = 255;
+        }
+    }
+
+    std::scoped_lock lock(frameMutex_);
+    latestFrame_ = std::move(frame);
+}
+
+bool DirectShowWebcamCapture::copyLatestFrame(std::vector<BYTE>& destination, int& width, int& height) {
+    std::scoped_lock lock(frameMutex_);
+    if (latestFrame_.empty() || width_ <= 0 || height_ <= 0) {
+        return false;
+    }
+
+    destination = latestFrame_;
+    width = width_;
+    height = height_;
+    return true;
+}
+
+int DirectShowWebcamCapture::width() const {
+    return width_;
+}
+
+int DirectShowWebcamCapture::height() const {
+    return height_;
+}
+
+int DirectShowWebcamCapture::fps() const {
+    return fps_;
+}
+
+const std::wstring& DirectShowWebcamCapture::selectedDeviceName() const {
+    return selectedDeviceName_;
+}
diff --git a/electron/native/wgc-capture/src/dshow_webcam_capture.h b/electron/native/wgc-capture/src/dshow_webcam_capture.h
new file mode 100644
index 000000000..906da8fa8
--- /dev/null
+++ b/electron/native/wgc-capture/src/dshow_webcam_capture.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <Windows.h>
+
+#include <atomic>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+class DirectShowWebcamCapture {
+public:
+    DirectShowWebcamCapture() = default;
+    ~DirectShowWebcamCapture();
+
+    DirectShowWebcamCapture(const DirectShowWebcamCapture&) = delete;
+    DirectShowWebcamCapture& operator=(const DirectShowWebcamCapture&) = delete;
+
+    bool initialize(
+        const std::wstring& deviceId,
+        const std::wstring& deviceName,
+        const std::wstring& directShowClsid,
+        int requestedWidth,
+        int requestedHeight,
+        int requestedFps);
+    bool start();
+    void stop();
+    bool copyLatestFrame(std::vector<BYTE>& destination, int& width, int& height);
+
+    int width() const;
+    int height() const;
+    int fps() const;
+    const std::wstring& selectedDeviceName() const;
+    void storeFrame(const BYTE* buffer, long length);
+
+private:
+    struct Impl;
+    void captureLoop();
+
+    Impl* impl_ = nullptr;
+    std::thread thread_;
+    std::atomic<bool> stopRequested_ = false;
+    std::mutex frameMutex_;
+    std::vector<BYTE> latestFrame_;
+    int width_ = 0;
+    int height_ = 0;
+    int fps_ = 30;
+    bool sourceTopDown_ = false;
+    std::wstring selectedDeviceName_;
+};
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 56c34be7d..c58f09259 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -41,6 +41,7 @@ struct CaptureConfig {
     double microphoneGain = 1.0;
     std::string webcamDeviceId;
     std::string webcamDeviceName;
+    std::string webcamDirectShowClsid;
     int webcamWidth = 0;
     int webcamHeight = 0;
     int webcamFps = 0;
@@ -280,6 +281,7 @@ bool parseConfig(const std::string& json, CaptureConfig& config) {
     config.microphoneGain = findDouble(json, "microphoneGain", 1.0);
     config.webcamDeviceId = findString(json, "webcamDeviceId");
     config.webcamDeviceName = findString(json, "webcamDeviceName");
+    config.webcamDirectShowClsid = findString(json, "webcamDirectShowClsid");
     config.webcamWidth = findInt(json, "webcamWidth", 0);
     config.webcamHeight = findInt(json, "webcamHeight", 0);
     config.webcamFps = findInt(json, "webcamFps", 0);
@@ -362,6 +364,7 @@ int main(int argc, char* argv[]) {
         if (!webcamCapture.initialize(
                 utf8ToWide(config.webcamDeviceId),
                 utf8ToWide(config.webcamDeviceName),
+                utf8ToWide(config.webcamDirectShowClsid),
                 config.webcamWidth,
                 config.webcamHeight,
                 config.webcamFps > 0 ? config.webcamFps : config.fps)) {
diff --git a/electron/native/wgc-capture/src/webcam_capture.cpp b/electron/native/wgc-capture/src/webcam_capture.cpp
index 708d72c56..aff9fdbfa 100644
--- a/electron/native/wgc-capture/src/webcam_capture.cpp
+++ b/electron/native/wgc-capture/src/webcam_capture.cpp
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <chrono>
+#include <cwctype>
 #include <iostream>
 
 namespace {
@@ -45,6 +46,89 @@ bool containsInsensitive(const std::wstring& haystack, const std::wstring& needl
         lowerNeedle.find(lowerHaystack) != std::wstring::npos;
 }
 
+std::wstring normalizeDeviceName(const std::wstring& value) {
+    std::wstring normalized;
+    normalized.reserve(value.size());
+    bool lastWasSpace = true;
+    for (const wchar_t ch : value) {
+        if (std::iswalnum(ch)) {
+            normalized.push_back(static_cast<wchar_t>(std::towlower(ch)));
+            lastWasSpace = false;
+            continue;
+        }
+        if (!lastWasSpace) {
+            normalized.push_back(L' ');
+            lastWasSpace = true;
+        }
+    }
+    while (!normalized.empty() && normalized.back() == L' ') {
+        normalized.pop_back();
+    }
+    return normalized;
+}
+
+std::vector<std::wstring> splitWords(const std::wstring& value) {
+    std::vector<std::wstring> words;
+    size_t start = 0;
+    while (start < value.size()) {
+        const size_t end = value.find(L' ', start);
+        const auto word = value.substr(start, end == std::wstring::npos ? std::wstring::npos : end - start);
+        if (word.size() > 1 && word != L"camera" && word != L"webcam" && word != L"video" && word != L"input") {
+            words.push_back(word);
+        }
+        if (end == std::wstring::npos) {
+            break;
+        }
+        start = end + 1;
+    }
+    return words;
+}
+
+int deviceMatchScore(
+    const std::wstring& candidateName,
+    const std::wstring& candidateLink,
+    const std::wstring& requestedName,
+    const std::wstring& requestedId) {
+    int score = 0;
+    const auto normalizedName = normalizeDeviceName(candidateName);
+    const auto normalizedLink = normalizeDeviceName(candidateLink);
+    const auto normalizedRequestedName = normalizeDeviceName(requestedName);
+    const auto normalizedRequestedId = normalizeDeviceName(requestedId);
+
+    if (!normalizedRequestedName.empty()) {
+        if (normalizedName == normalizedRequestedName) {
+            score = std::max(score, 1000);
+        }
+        if (containsInsensitive(normalizedName, normalizedRequestedName)) {
+            score = std::max(score, 900);
+        }
+        if (containsInsensitive(normalizedLink, normalizedRequestedName)) {
+            score = std::max(score, 800);
+        }
+
+        int wordScore = 0;
+        for (const auto& word : splitWords(normalizedRequestedName)) {
+            if (normalizedName.find(word) != std::wstring::npos) {
+                wordScore += 100;
+            } else if (normalizedLink.find(word) != std::wstring::npos) {
+                wordScore += 50;
+            }
+        }
+        score = std::max(score, wordScore);
+    }
+
+    if (!normalizedRequestedId.empty()) {
+        if (containsInsensitive(normalizedLink, normalizedRequestedId)) {
+            score = std::max(score, 700);
+        }
+        if (containsInsensitive(normalizedName, normalizedRequestedId)) {
+            score = std::max(score, 600);
+        }
+    }
+
+    return score;
+}
+
 } // namespace
 
 WebcamCapture::~WebcamCapture() {
@@ -54,15 +138,49 @@ WebcamCapture::~WebcamCapture() {
 bool WebcamCapture::initialize(
     const std::wstring& deviceId,
     const std::wstring& deviceName,
+    const std::wstring& directShowClsid,
     int requestedWidth,
     int requestedHeight,
     int requestedFps) {
     fps_ = std::clamp(requestedFps > 0 ? requestedFps : 30, 1, 60);
+    usingDirectShow_ = false;
+    selectedMatchScore_ = 0;
     if (!succeeded(MFStartup(MF_VERSION), "MFStartup(webcam)")) {
+        if (directShowCapture_.initialize(deviceId, deviceName, directShowClsid, requestedWidth, requestedHeight, fps_)) {
+            usingDirectShow_ = true;
+            return true;
+        }
         return false;
     }
     mfStarted_ = true;
     if (!selectDevice(deviceId, deviceName)) {
+        if (mfStarted_) {
+            MFShutdown();
+            mfStarted_ = false;
+        }
+        if (directShowCapture_.initialize(deviceId, deviceName, directShowClsid, requestedWidth, requestedHeight, fps_)) {
+            usingDirectShow_ = true;
+            return true;
+        }
+        return false;
+    }
+
+    if ((!deviceId.empty() || !deviceName.empty()) && selectedMatchScore_ <= 0) {
+        if (mediaSource_) {
+            mediaSource_->Shutdown();
+        }
+        sourceReader_.Reset();
+        mediaSource_.Reset();
+        if (mfStarted_) {
+            MFShutdown();
+            mfStarted_ = false;
+        }
+        if (directShowCapture_.initialize(deviceId, deviceName, directShowClsid, requestedWidth, requestedHeight, fps_)) {
+            usingDirectShow_ = true;
+            return true;
+        }
+        std::cerr << "ERROR: Requested webcam device was not found by native Windows webcam providers"
+                  << std::endl;
         return false;
     }
 
@@ -93,34 +211,24 @@ bool WebcamCapture::selectDevice(const std::wstring& deviceId, const std::wstrin
     }
 
     UINT32 selectedIndex = 0;
-    bool matched = false;
-    auto matchesRequestedDevice = [&](const std::wstring& name, const std::wstring& symbolicLink) {
-        if (!deviceName.empty() &&
-            (containsInsensitive(name, deviceName) || containsInsensitive(symbolicLink, deviceName))) {
-            return true;
-        }
-        if (!deviceId.empty() &&
-            (containsInsensitive(symbolicLink, deviceId) || containsInsensitive(name, deviceId))) {
-            return true;
-        }
-        return false;
-    };
-
+    int bestScore = 0;
     for (UINT32 index = 0; index < deviceCount; index += 1) {
         const std::wstring name = readAllocatedString(devices[index], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
         const std::wstring symbolicLink = readAllocatedString(devices[index], MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK);
-        if (matchesRequestedDevice(name, symbolicLink)) {
+        const int score = deviceMatchScore(name, symbolicLink, deviceName, deviceId);
+        std::wcerr << L"INFO: Native webcam candidate [" << index << L"] name=\"" << name << L"\" score=" << score << std::endl;
+        if (score > bestScore) {
             selectedIndex = index;
-            matched = true;
-            break;
+            bestScore = score;
         }
     }
 
-    if ((!deviceId.empty() || !deviceName.empty()) && !matched) {
-        std::cerr << "WARNING: Requested webcam device was not found by Media Foundation; using default webcam"
+    if ((!deviceId.empty() || !deviceName.empty()) && bestScore <= 0) {
+        std::cerr << "WARNING: Requested webcam device was not found by Media Foundation; trying DirectShow"
                   << std::endl;
     }
 
+    selectedMatchScore_ = bestScore;
     selectedDeviceName_ = readAllocatedString(devices[selectedIndex], MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME);
     hr = devices[selectedIndex]->ActivateObject(IID_PPV_ARGS(&mediaSource_));
 
@@ -181,6 +289,9 @@ bool WebcamCapture::configureReader(int requestedWidth, int requestedHeight, int
 }
 
 bool WebcamCapture::start() {
+    if (usingDirectShow_) {
+        return directShowCapture_.start();
+    }
     if (!sourceReader_ || thread_.joinable()) {
         return false;
     }
@@ -191,6 +302,7 @@ bool WebcamCapture::start() {
 }
 
 void WebcamCapture::stop() {
+    directShowCapture_.stop();
     stopRequested_ = true;
     if (thread_.joinable()) {
         thread_.join();
@@ -262,6 +374,9 @@ void WebcamCapture::captureLoop() {
 }
 
 bool WebcamCapture::copyLatestFrame(std::vector<BYTE>& destination, int& width, int& height) {
+    if (usingDirectShow_) {
+        return directShowCapture_.copyLatestFrame(destination, width, height);
+    }
     std::scoped_lock lock(frameMutex_);
     if (latestFrame_.empty() || width_ <= 0 || height_ <= 0) {
         return false;
@@ -274,17 +389,29 @@ bool WebcamCapture::copyLatestFrame(std::vector<BYTE>& destination, int& width,
 }
 
 int WebcamCapture::width() const {
+    if (usingDirectShow_) {
+        return directShowCapture_.width();
+    }
     return width_;
 }
 
 int WebcamCapture::height() const {
+    if (usingDirectShow_) {
+        return directShowCapture_.height();
+    }
     return height_;
 }
 
 int WebcamCapture::fps() const {
+    if (usingDirectShow_) {
+        return directShowCapture_.fps();
+    }
     return fps_;
 }
 
 const std::wstring& WebcamCapture::selectedDeviceName() const {
+    if (usingDirectShow_) {
+        return directShowCapture_.selectedDeviceName();
+    }
     return selectedDeviceName_;
 }
diff --git a/electron/native/wgc-capture/src/webcam_capture.h b/electron/native/wgc-capture/src/webcam_capture.h
index 201db2598..c539d025c 100644
--- a/electron/native/wgc-capture/src/webcam_capture.h
+++ b/electron/native/wgc-capture/src/webcam_capture.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "dshow_webcam_capture.h"
+
 #include <Windows.h>
 #include <mfidl.h>
 #include <mfreadwrite.h>
@@ -23,6 +25,7 @@ class WebcamCapture {
     bool initialize(
         const std::wstring& deviceId,
         const std::wstring& deviceName,
+        const std::wstring& directShowClsid,
         int requestedWidth,
         int requestedHeight,
         int requestedFps);
@@ -42,6 +45,7 @@ class WebcamCapture {
 
     Microsoft::WRL::ComPtr<IMFMediaSource> mediaSource_;
     Microsoft::WRL::ComPtr<IMFSourceReader> sourceReader_;
+    DirectShowWebcamCapture directShowCapture_;
     std::thread thread_;
     std::atomic<bool> stopRequested_ = false;
     std::mutex frameMutex_;
@@ -50,5 +54,7 @@ class WebcamCapture {
     int height_ = 0;
     int fps_ = 30;
     bool mfStarted_ = false;
+    bool usingDirectShow_ = false;
+    int selectedMatchScore_ = 0;
     std::wstring selectedDeviceName_;
 };
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index 3f9fb930c..65b192ebf 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -105,6 +105,67 @@ function startFixtureWindow() {
 	});
 }
 
+function normalizeDeviceName(value) {
+	return value
+		.toLowerCase()
+		.replace(/[^a-z0-9]+/g, " ")
+		.trim();
+}
+
+function scoreDeviceName(candidateName, candidateId, requestedName) {
+	const candidate = normalizeDeviceName(candidateName ?? "");
+	const id = normalizeDeviceName(candidateId ?? "");
+	const requested = normalizeDeviceName(requestedName ?? "");
+	if (!requested) return 0;
+	if (candidate === requested) return 1000;
+	if (candidate.includes(requested) || requested.includes(candidate)) return 900;
+	if (id.includes(requested) || requested.includes(id)) return 800;
+	return requested
+		.split(/\s+/)
+		.filter((word) => word.length > 1 && !["camera", "webcam", "video", "input"].includes(word))
+		.reduce((score, word) => {
+			if (candidate.includes(word)) return score + 100;
+			if (id.includes(word)) return score + 50;
+			return score;
+		}, 0);
+}
+
+function resolveDirectShowWebcamClsid(requestedName) {
+	if (!requestedName) return "";
+	const query = spawnSync(
+		"reg.exe",
+		["query", "HKCR\\CLSID\\{860BB310-5D01-11D0-BD3B-00A0C911CE86}\\Instance", "/s"],
+		{ encoding: "utf8", windowsHide: true },
+	);
+	if (query.status !== 0) return "";
+	const entries = [];
+	let current = {};
+	for (const rawLine of query.stdout.split(/\r?\n/)) {
+		const line = rawLine.trim();
+		if (!line) continue;
+		if (/^HKEY_/i.test(line)) {
+			if (current.friendlyName || current.clsid) entries.push(current);
+			current = {};
+			continue;
+		}
+		const match = line.match(/^(\S+)\s+REG_SZ\s+(.+)$/);
+		if (!match) continue;
+		if (match[1] === "FriendlyName") current.friendlyName = match[2].trim();
+		if (match[1] === "CLSID") current.clsid = match[2].trim();
+	}
+	if (current.friendlyName || current.clsid) entries.push(current);
+
+	let best = null;
+	for (const entry of entries) {
+		if (!entry.clsid) continue;
+		const score = scoreDeviceName(entry.friendlyName, entry.clsid, requestedName);
+		if (!best || score > best.score) {
+			best = { ...entry, score };
+		}
+	}
+	return best && best.score > 0 ? best.clsid : "";
+}
+
 function probeStreams(outputPath) {
 	const ffprobe = spawnSync(
 		"ffprobe",
@@ -191,6 +252,9 @@ const config = {
 	webcamEnabled: WITH_WEBCAM,
 	webcamDeviceId: process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_ID ?? "",
 	webcamDeviceName: process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME ?? "",
+	webcamDirectShowClsid: resolveDirectShowWebcamClsid(
+		process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME ?? "",
+	),
 	webcamWidth: 640,
 	webcamHeight: 360,
 	webcamFps: 30,
@@ -224,6 +288,13 @@ if (!fs.existsSync(outputPath) || fs.statSync(outputPath).size === 0) {
 const streams = probeStreams(outputPath);
 const hasVideo = streams.some((stream) => stream.codec_type === "video");
 const hasAudio = streams.some((stream) => stream.codec_type === "audio");
+const webcamFormatLine = result.stdout
+	.split(/\r?\n/)
+	.find((line) => line.includes('"event":"webcam-format"'));
+const webcamFormat = webcamFormatLine ? JSON.parse(webcamFormatLine) : null;
+const nativeWebcamDiagnostics = result.stderr
+	.split(/\r?\n/)
+	.filter((line) => line.includes("Native webcam candidate"));
 if (!hasVideo) {
 	throw new Error(`WGC helper output has no video stream: ${outputPath}`);
 }
@@ -249,6 +320,8 @@ console.log(
 				codecName: stream.codec_name,
 				duration: stream.duration,
 			})),
+			selectedWebcamDeviceName: webcamFormat?.deviceName,
+			nativeWebcamDiagnostics,
 			firstFrameLuma: frameLuma,
 		},
 		null,
diff --git a/src/lib/nativeWindowsRecording.ts b/src/lib/nativeWindowsRecording.ts
index 59de0be73..ee8ecc86a 100644
--- a/src/lib/nativeWindowsRecording.ts
+++ b/src/lib/nativeWindowsRecording.ts
@@ -27,6 +27,7 @@ export type NativeWindowsRecordingRequest = {
 		enabled: boolean;
 		deviceId?: string;
 		deviceName?: string;
+		directShowClsid?: string;
 		width: number;
 		height: number;
 		fps: number;

From c13e8a1c093e72bcd60d03fc157dde51e10241b7 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 18:51:08 +0200
Subject: [PATCH 18/38] fix: skip black webcam warmup frames

---
 .../windows-native-recorder-roadmap.md        |  1 +
 docs/testing/windows-native-cursor.md         |  6 +-
 electron/native/wgc-capture/src/main.cpp      | 57 +++++++++++++++++--
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index 512915382..29986db50 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -158,6 +158,7 @@ Acceptance:
 - Add Media Foundation webcam source reader.
 - Select requested dimensions/fps or the nearest format accepted by Media Foundation.
 - Convert webcam samples to BGRA and compose them into the primary helper MP4 as an initial bottom-right picture-in-picture overlay.
+- Ignore black webcam warmup frames and keep the overlay hidden until the first visible frame is available, so virtual cameras do not flash a black picture-in-picture rectangle at recording start.
 - Keep the helper process as the SSOT for screen/window, WASAPI system audio, microphone, webcam, and mux timing.
 - Match the requested webcam through Media Foundation friendly names first, then browser device ids/symbolic links, so UI selection remains stable across Chromium and Windows native device namespaces.
 - Use the Electron-resolved DirectShow CLSID when the selected virtual camera, for example NVIDIA Broadcast, is registered for DirectShow but absent from Media Foundation enumeration.
diff --git a/docs/testing/windows-native-cursor.md b/docs/testing/windows-native-cursor.md
index 23c57a91d..4c7da9429 100644
--- a/docs/testing/windows-native-cursor.md
+++ b/docs/testing/windows-native-cursor.md
@@ -93,7 +93,7 @@ Current native availability rules:
 - Windows 10 build 19041 or newer
 - a helper executable is available
 
-The helper currently implements display video capture and system audio loopback. Window capture, microphone audio, and webcam capture are part of the native recorder roadmap and fail explicitly instead of silently falling back to Electron capture on Windows.
+The helper currently implements display/window video capture, system audio loopback, default microphone capture, Media Foundation webcam capture, and DirectShow fallback for selected virtual cameras such as NVIDIA Broadcast. Webcam frames are composed into the primary MP4 as a bottom-right picture-in-picture overlay, and black webcam warmup frames are ignored until the first visible frame is available.
 
 Build OpenScreen's helper locally:
 
@@ -105,7 +105,11 @@ Smoke-test the helper directly:
 
 ```powershell
 npm run test:wgc-helper:win
+npm run test:wgc-window:win
 npm run test:wgc-audio:win
+npm run test:wgc-mic:win
+npm run test:wgc-mixed-audio:win
+npm run test:wgc-webcam:win
 ```
 
 For local diagnostics with another compatible helper, point OpenScreen at that executable:
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index c58f09259..6543d8345 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -97,6 +97,31 @@ std::string jsonEscape(const std::string& value) {
     return result;
 }
 
+bool hasVisibleBgraContent(const std::vector<BYTE>& frame) {
+    if (frame.size() < 4) {
+        return false;
+    }
+
+    uint64_t lumaTotal = 0;
+    BYTE maxLuma = 0;
+    const size_t pixelCount = frame.size() / 4;
+    const size_t step = std::max<size_t>(1, pixelCount / 4096);
+    size_t sampledPixels = 0;
+    for (size_t pixel = 0; pixel < pixelCount; pixel += step) {
+        const size_t offset = pixel * 4;
+        const BYTE b = frame[offset + 0];
+        const BYTE g = frame[offset + 1];
+        const BYTE r = frame[offset + 2];
+        const BYTE luma = static_cast<BYTE>((static_cast<uint16_t>(r) * 54 + static_cast<uint16_t>(g) * 183 + static_cast<uint16_t>(b) * 19) >> 8);
+        lumaTotal += luma;
+        maxLuma = std::max(maxLuma, luma);
+        sampledPixels += 1;
+    }
+
+    const uint64_t averageLuma = sampledPixels > 0 ? lumaTotal / sampledPixels : 0;
+    return maxLuma > 24 || averageLuma > 4;
+}
+
 bool findBool(const std::string& json, const std::string& key, bool fallback) {
     auto pos = json.find("\"" + key + "\"");
     if (pos == std::string::npos) {
@@ -432,6 +457,7 @@ int main(int argc, char* argv[]) {
     std::vector<BYTE> latestWebcamFrame;
     int latestWebcamWidth = 0;
     int latestWebcamHeight = 0;
+    bool hasVisibleWebcamFrame = false;
 
     session.setFrameCallback([&](ID3D11Texture2D* texture, int64_t timestampHns) {
         (void)timestampHns;
@@ -468,10 +494,19 @@ int main(int argc, char* argv[]) {
             {
                 std::scoped_lock lock(mutex);
                 if (webcamActive) {
-                    webcamCapture.copyLatestFrame(latestWebcamFrame, latestWebcamWidth, latestWebcamHeight);
+                    std::vector<BYTE> candidateWebcamFrame;
+                    int candidateWebcamWidth = 0;
+                    int candidateWebcamHeight = 0;
+                    if (webcamCapture.copyLatestFrame(candidateWebcamFrame, candidateWebcamWidth, candidateWebcamHeight) &&
+                        hasVisibleBgraContent(candidateWebcamFrame)) {
+                        latestWebcamFrame = std::move(candidateWebcamFrame);
+                        latestWebcamWidth = candidateWebcamWidth;
+                        latestWebcamHeight = candidateWebcamHeight;
+                        hasVisibleWebcamFrame = true;
+                    }
                 }
                 const BgraFrameView webcamFrame{
-                    latestWebcamFrame.empty() ? nullptr : latestWebcamFrame.data(),
+                    hasVisibleWebcamFrame && !latestWebcamFrame.empty() ? latestWebcamFrame.data() : nullptr,
                     latestWebcamWidth,
                     latestWebcamHeight,
                 };
@@ -583,12 +618,22 @@ int main(int argc, char* argv[]) {
         }
         webcamActive = true;
         const auto webcamDeadline = std::chrono::steady_clock::now() + std::chrono::seconds(3);
-        while (std::chrono::steady_clock::now() < webcamDeadline &&
-               !webcamCapture.copyLatestFrame(latestWebcamFrame, latestWebcamWidth, latestWebcamHeight)) {
+        while (std::chrono::steady_clock::now() < webcamDeadline && !hasVisibleWebcamFrame) {
+            std::vector<BYTE> candidateWebcamFrame;
+            int candidateWebcamWidth = 0;
+            int candidateWebcamHeight = 0;
+            if (webcamCapture.copyLatestFrame(candidateWebcamFrame, candidateWebcamWidth, candidateWebcamHeight) &&
+                hasVisibleBgraContent(candidateWebcamFrame)) {
+                latestWebcamFrame = std::move(candidateWebcamFrame);
+                latestWebcamWidth = candidateWebcamWidth;
+                latestWebcamHeight = candidateWebcamHeight;
+                hasVisibleWebcamFrame = true;
+                break;
+            }
             std::this_thread::sleep_for(std::chrono::milliseconds(20));
         }
-        if (latestWebcamFrame.empty()) {
-            std::cerr << "WARNING: Native webcam started but no frame was available before screen capture"
+        if (!hasVisibleWebcamFrame) {
+            std::cerr << "WARNING: Native webcam started but no visible frame was available before screen capture"
                       << std::endl;
         }
     }

From dcb402f7e857bf48dec3d8c132758d3a8deca021 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 19:24:32 +0200
Subject: [PATCH 19/38] fix: gate Windows cursor settings

---
 .../windowsNativeRecordingSession.script.ts   | 66 +++++++++++++++++-
 scripts/test-windows-native-cursor.mjs        | 67 ++++++++++++++++++-
 src/components/video-editor/SettingsPanel.tsx |  6 +-
 src/components/video-editor/VideoEditor.tsx   | 29 +++++++-
 src/lib/cursor/nativeCursor.ts                | 36 +++++++++-
 src/native/contracts.ts                       |  2 +
 6 files changed, 198 insertions(+), 8 deletions(-)

diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index 2ad9bbeab..f97105e0d 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -111,6 +111,62 @@ function Write-JsonLine($payload) {
     [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
 }
 
+function Get-CustomCursorType($bitmap, $hotspotX, $hotspotY) {
+    if ($bitmap.Width -lt 24 -or $bitmap.Height -lt 24 -or $bitmap.Width -gt 64 -or $bitmap.Height -gt 64) {
+        return $null
+    }
+
+    if ($hotspotX -lt ($bitmap.Width * 0.25) -or $hotspotX -gt ($bitmap.Width * 0.75) -or
+        $hotspotY -lt ($bitmap.Height * 0.15) -or $hotspotY -gt ($bitmap.Height * 0.55)) {
+        return $null
+    }
+
+    $opaquePixels = 0
+    $topHalfOpaquePixels = 0
+    $left = $bitmap.Width
+    $top = $bitmap.Height
+    $right = -1
+    $bottom = -1
+
+    for ($y = 0; $y -lt $bitmap.Height; $y++) {
+        for ($x = 0; $x -lt $bitmap.Width; $x++) {
+            if ($bitmap.GetPixel($x, $y).A -le 32) {
+                continue
+            }
+
+            $opaquePixels += 1
+            if ($y -lt ($bitmap.Height / 2)) {
+                $topHalfOpaquePixels += 1
+            }
+            if ($x -lt $left) { $left = $x }
+            if ($x -gt $right) { $right = $x }
+            if ($y -lt $top) { $top = $y }
+            if ($y -gt $bottom) { $bottom = $y }
+        }
+    }
+
+    if ($opaquePixels -lt 90 -or $right -lt $left -or $bottom -lt $top) {
+        return $null
+    }
+
+    $opaqueWidth = $right - $left + 1
+    $opaqueHeight = $bottom - $top + 1
+    if ($opaqueWidth -lt ($bitmap.Width * 0.35) -or $opaqueWidth -gt ($bitmap.Width * 0.9) -or
+        $opaqueHeight -lt ($bitmap.Height * 0.45) -or $opaqueHeight -gt $bitmap.Height) {
+        return $null
+    }
+
+    if ($top -gt ($bitmap.Height * 0.45) -or $bottom -lt ($bitmap.Height * 0.65)) {
+        return $null
+    }
+
+    if ($topHalfOpaquePixels -gt ($opaquePixels * 0.55)) {
+        return 'closed-hand'
+    }
+
+    return 'open-hand'
+}
+
 function Get-TargetBounds() {
 	if ([string]::IsNullOrWhiteSpace($targetWindowHandle)) {
 		return $null
@@ -164,6 +220,9 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
         try {
             $graphics.Clear([System.Drawing.Color]::Transparent)
             $graphics.DrawIcon($icon, 0, 0)
+            $hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
+            $hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+            $customCursorType = Get-CustomCursorType -bitmap $bitmap -hotspotX $hotspotX -hotspotY $hotspotY
             $bitmap.Save($memoryStream, [System.Drawing.Imaging.ImageFormat]::Png)
             $base64 = [System.Convert]::ToBase64String($memoryStream.ToArray())
 
@@ -172,8 +231,9 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
                 imageDataUrl = "data:image/png;base64,$base64"
                 width = $bitmap.Width
                 height = $bitmap.Height
-                hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
-                hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+                hotspotX = $hotspotX
+                hotspotY = $hotspotY
+                cursorType = $customCursorType
             }
         }
         finally {
@@ -218,6 +278,8 @@ while ($true) {
         $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
         if ($asset -and $cursorType) {
             $asset.cursorType = $cursorType
+        } elseif ($asset -and $asset.cursorType) {
+            $cursorType = $asset.cursorType
         }
         $lastCursorId = $cursorId
     }
diff --git a/scripts/test-windows-native-cursor.mjs b/scripts/test-windows-native-cursor.mjs
index 2a8b34c7f..7d7ea45b3 100644
--- a/scripts/test-windows-native-cursor.mjs
+++ b/scripts/test-windows-native-cursor.mjs
@@ -195,6 +195,62 @@ function Write-JsonLine($payload) {
     [Console]::Out.WriteLine(($payload | ConvertTo-Json -Compress -Depth 6))
 }
 
+function Get-CustomCursorType($bitmap, $hotspotX, $hotspotY) {
+    if ($bitmap.Width -lt 24 -or $bitmap.Height -lt 24 -or $bitmap.Width -gt 64 -or $bitmap.Height -gt 64) {
+        return $null
+    }
+
+    if ($hotspotX -lt ($bitmap.Width * 0.25) -or $hotspotX -gt ($bitmap.Width * 0.75) -or
+        $hotspotY -lt ($bitmap.Height * 0.15) -or $hotspotY -gt ($bitmap.Height * 0.55)) {
+        return $null
+    }
+
+    $opaquePixels = 0
+    $topHalfOpaquePixels = 0
+    $left = $bitmap.Width
+    $top = $bitmap.Height
+    $right = -1
+    $bottom = -1
+
+    for ($y = 0; $y -lt $bitmap.Height; $y++) {
+        for ($x = 0; $x -lt $bitmap.Width; $x++) {
+            if ($bitmap.GetPixel($x, $y).A -le 32) {
+                continue
+            }
+
+            $opaquePixels += 1
+            if ($y -lt ($bitmap.Height / 2)) {
+                $topHalfOpaquePixels += 1
+            }
+            if ($x -lt $left) { $left = $x }
+            if ($x -gt $right) { $right = $x }
+            if ($y -lt $top) { $top = $y }
+            if ($y -gt $bottom) { $bottom = $y }
+        }
+    }
+
+    if ($opaquePixels -lt 90 -or $right -lt $left -or $bottom -lt $top) {
+        return $null
+    }
+
+    $opaqueWidth = $right - $left + 1
+    $opaqueHeight = $bottom - $top + 1
+    if ($opaqueWidth -lt ($bitmap.Width * 0.35) -or $opaqueWidth -gt ($bitmap.Width * 0.9) -or
+        $opaqueHeight -lt ($bitmap.Height * 0.45) -or $opaqueHeight -gt $bitmap.Height) {
+        return $null
+    }
+
+    if ($top -gt ($bitmap.Height * 0.45) -or $bottom -lt ($bitmap.Height * 0.65)) {
+        return $null
+    }
+
+    if ($topHalfOpaquePixels -gt ($opaquePixels * 0.55)) {
+        return 'closed-hand'
+    }
+
+    return 'open-hand'
+}
+
 function Get-CursorAsset($cursorHandle, $cursorId) {
     $copiedHandle = [OpenScreenCursorDiagnosticInterop]::CopyIcon($cursorHandle)
     if ($copiedHandle -eq [IntPtr]::Zero) {
@@ -213,6 +269,9 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
         try {
             $graphics.Clear([System.Drawing.Color]::Transparent)
             $graphics.DrawIcon($icon, 0, 0)
+            $hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
+            $hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+            $customCursorType = Get-CustomCursorType -bitmap $bitmap -hotspotX $hotspotX -hotspotY $hotspotY
             $bitmap.Save($memoryStream, [System.Drawing.Imaging.ImageFormat]::Png)
             $base64 = [System.Convert]::ToBase64String($memoryStream.ToArray())
 
@@ -221,8 +280,9 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
                 imageDataUrl = "data:image/png;base64,$base64"
                 width = $bitmap.Width
                 height = $bitmap.Height
-                hotspotX = if ($hasIconInfo) { $iconInfo.xHotspot } else { 0 }
-                hotspotY = if ($hasIconInfo) { $iconInfo.yHotspot } else { 0 }
+                hotspotX = $hotspotX
+                hotspotY = $hotspotY
+                cursorType = $customCursorType
             }
         }
         finally {
@@ -268,6 +328,8 @@ while ($true) {
         $asset = Get-CursorAsset -cursorHandle $cursorInfo.hCursor -cursorId $cursorId
         if ($asset -and $cursorType) {
             $asset.cursorType = $cursorType
+        } elseif ($asset -and $asset.cursorType) {
+            $cursorType = $asset.cursorType
         }
         $lastCursorId = $cursorId
     }
@@ -1068,6 +1130,7 @@ const report = {
 		height: asset.height,
 		hotspotX: asset.hotspotX,
 		hotspotY: asset.hotspotY,
+		cursorType: asset.cursorType ?? null,
 	})),
 };
 const recordingData = toRecordingData(samples, assets);
diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsx
index 58dc5894e..297fc31c0 100644
--- a/src/components/video-editor/SettingsPanel.tsx
+++ b/src/components/video-editor/SettingsPanel.tsx
@@ -252,6 +252,7 @@ interface SettingsPanelProps {
 	cursorClickBounce?: number;
 	onCursorClickBounceChange?: (bounce: number) => void;
 	hasCursorData?: boolean;
+	showCursorSettings?: boolean;
 }
 
 export default SettingsPanel;
@@ -350,6 +351,7 @@ export function SettingsPanel({
 	cursorClickBounce = 2.5,
 	onCursorClickBounceChange,
 	hasCursorData = false,
+	showCursorSettings = true,
 }: SettingsPanelProps) {
 	const t = useScopedT("settings");
 	// Resolved URLs are for DOM rendering only (backgroundImage). The canonical
@@ -1050,7 +1052,7 @@ export function SettingsPanel({
 								</div>
 							</div>
 
-							{cursorHighlight && onCursorHighlightChange && (
+							{showCursorSettings && cursorHighlight && onCursorHighlightChange && (
 								<div className="p-2 rounded-lg bg-white/5 border border-white/5 mt-2 space-y-2">
 									<div className="flex items-center justify-between">
 										<div className="text-[10px] font-medium text-slate-300">Cursor highlight</div>
@@ -1236,7 +1238,7 @@ export function SettingsPanel({
 						</AccordionContent>
 					</AccordionItem>
 
-					{hasCursorData && (
+					{showCursorSettings && hasCursorData && (
 						<AccordionItem
 							value="cursor"
 							className="border-white/5 rounded-xl bg-white/[0.02] px-3"
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 509daa997..175057f47 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -34,6 +34,7 @@ import { matchesShortcut } from "@/lib/shortcuts";
 import { loadUserPreferences, saveUserPreferences } from "@/lib/userPreferences";
 import { BackgroundLoadError } from "@/lib/wallpaper";
 import { nativeBridgeClient, useCursorRecordingData, useCursorTelemetry } from "@/native";
+import type { NativePlatform } from "@/native/contracts";
 import {
 	getAspectRatioValue,
 	getNativeAspectRatioValue,
@@ -155,7 +156,7 @@ export default function VideoEditor() {
 		useCursorTelemetry(cursorTelemetrySourcePath);
 	const { data: cursorRecordingData, error: cursorRecordingDataError } =
 		useCursorRecordingData(cursorTelemetrySourcePath);
-	const cursorClickTimestamps: number[] = [];
+	const cursorClickTimestamps = useMemo<number[]>(() => [], []);
 
 	// Cursor & motion blur visual settings (non-undoable preferences)
 	const [showCursor, setShowCursor] = useState(true);
@@ -163,6 +164,7 @@ export default function VideoEditor() {
 	const [cursorSmoothing, setCursorSmoothing] = useState(DEFAULT_CURSOR_SMOOTHING);
 	const [cursorMotionBlur, setCursorMotionBlur] = useState(DEFAULT_CURSOR_MOTION_BLUR);
 	const [cursorClickBounce, setCursorClickBounce] = useState(DEFAULT_CURSOR_CLICK_BOUNCE);
+	const [nativePlatform, setNativePlatform] = useState<NativePlatform | null>(null);
 
 	const videoPlaybackRef = useRef<VideoPlaybackRef>(null);
 
@@ -171,6 +173,7 @@ export default function VideoEditor() {
 	const nextSpeedIdRef = useRef(1);
 
 	const { shortcuts, isMac } = useShortcuts();
+	const showCursorSettings = nativePlatform === "win32";
 	// Off-Mac doesn't have click telemetry, so force `onlyOnClicks` off for
 	// renderers while keeping the persisted value intact for round-tripping.
 	const effectiveCursorHighlight = useMemo(
@@ -608,6 +611,27 @@ export default function VideoEditor() {
 		};
 	}, [handleLoadProject, handleSaveProject, handleSaveProjectAs]);
 
+	useEffect(() => {
+		let canceled = false;
+		nativeBridgeClient.system
+			.getPlatform()
+			.then((platform) => {
+				if (!canceled) {
+					setNativePlatform(platform);
+				}
+			})
+			.catch((error) => {
+				console.warn("Unable to resolve native platform for cursor settings:", error);
+				if (!canceled) {
+					setNativePlatform(null);
+				}
+			});
+
+		return () => {
+			canceled = true;
+		};
+	}, []);
+
 	useEffect(() => {
 		if (cursorTelemetryError) {
 			console.warn("Unable to load cursor telemetry:", cursorTelemetryError);
@@ -1654,6 +1678,8 @@ export default function VideoEditor() {
 			cursorTelemetry,
 			cursorClickTimestamps,
 			effectiveCursorHighlight,
+			showCursor,
+			cursorSize,
 			t,
 		],
 	);
@@ -2116,6 +2142,7 @@ export default function VideoEditor() {
 						cursorClickBounce={cursorClickBounce}
 						onCursorClickBounceChange={setCursorClickBounce}
 						hasCursorData={cursorTelemetry.length > 0}
+						showCursorSettings={showCursorSettings}
 					/>
 				</div>
 			</div>
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 04ebccd64..6f82e0ba6 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -2,6 +2,8 @@ import { type Container, Point } from "pixi.js";
 import appStartingUrl from "@/assets/cursors/Cursor=App-Starting.svg";
 import crosshairUrl from "@/assets/cursors/Cursor=Cross.svg";
 import arrowUrl from "@/assets/cursors/Cursor=Default.svg";
+import closedHandUrl from "@/assets/cursors/Cursor=Hand-(Grabbing).svg";
+import openHandUrl from "@/assets/cursors/Cursor=Hand-(Open).svg";
 import pointerUrl from "@/assets/cursors/Cursor=Hand-(Pointing).svg";
 import helpUrl from "@/assets/cursors/Cursor=Help.svg";
 import moveUrl from "@/assets/cursors/Cursor=Move.svg";
@@ -78,6 +80,20 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 		hotspotX: 16,
 		hotspotY: 16,
 	},
+	"open-hand": {
+		imageDataUrl: openHandUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 9,
+	},
+	"closed-hand": {
+		imageDataUrl: closedHandUrl,
+		width: 32,
+		height: 32,
+		hotspotX: 16,
+		hotspotY: 9,
+	},
 	"resize-ew": {
 		imageDataUrl: resizeEwUrl,
 		width: 32,
@@ -150,6 +166,22 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 	},
 };
 
+function resolveUntypedPrettyNativeCursorAsset(asset: NativeCursorAsset) {
+	if (asset.cursorType || asset.width < 24 || asset.width > 64 || asset.height < 24 || asset.height > 64) {
+		return null;
+	}
+
+	const hotspotXNorm = asset.hotspotX / asset.width;
+	const hotspotYNorm = asset.hotspotY / asset.height;
+	const looksLikeChromiumGrabCursor =
+		hotspotXNorm >= 0.22 &&
+		hotspotXNorm <= 0.55 &&
+		hotspotYNorm >= 0.2 &&
+		hotspotYNorm <= 0.45;
+
+	return looksLikeChromiumGrabCursor ? (PRETTY_NATIVE_CURSOR_ASSETS["open-hand"] ?? null) : null;
+}
+
 export function hasNativeCursorRecordingData(
 	recordingData: CursorRecordingData | null | undefined,
 ): recordingData is CursorRecordingData {
@@ -322,7 +354,9 @@ export function resolvePrettyNativeCursorAsset(
 	sample?: CursorRecordingSample,
 ) {
 	const cursorType = sample?.cursorType ?? asset.cursorType ?? null;
-	return cursorType ? (PRETTY_NATIVE_CURSOR_ASSETS[cursorType] ?? null) : null;
+	return cursorType
+		? (PRETTY_NATIVE_CURSOR_ASSETS[cursorType] ?? null)
+		: resolveUntypedPrettyNativeCursorAsset(asset);
 }
 
 export function resolveNativeCursorRenderAsset(
diff --git a/src/native/contracts.ts b/src/native/contracts.ts
index a3c908706..ef45336d0 100644
--- a/src/native/contracts.ts
+++ b/src/native/contracts.ts
@@ -8,6 +8,8 @@ export type NativeCursorType =
 	| "text"
 	| "pointer"
 	| "crosshair"
+	| "open-hand"
+	| "closed-hand"
 	| "resize-ew"
 	| "resize-ns"
 	| "resize-nesw"

From d310e9192882111c9f7ed2a57782f33f1304b549 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 20:10:09 +0200
Subject: [PATCH 20/38] test: add Windows native checklist smoke test

---
 package.json                               |   1 +
 src/components/launch/LaunchWindow.tsx     |   7 +
 src/components/launch/SourceSelector.tsx   |   5 +
 tests/e2e/windows-native-checklist.spec.ts | 306 +++++++++++++++++++++
 4 files changed, 319 insertions(+)
 create mode 100644 tests/e2e/windows-native-checklist.spec.ts

diff --git a/package.json b/package.json
index 5724af697..9833eda98 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
 		"test:browser": "vitest --config vitest.browser.config.ts --run",
 		"test:browser:install": "playwright install --with-deps chromium-headless-shell",
 		"test:e2e": "playwright test",
+		"test:e2e:windows-native-checklist": "playwright test tests/e2e/windows-native-checklist.spec.ts",
 		"prepare": "husky",
 		"rebuild:native": "node ./scripts/rebuild-native.mjs",
 		"postinstall": "npm run rebuild:native"
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 1de1b3841..5c8701eb4 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -510,6 +510,7 @@ export function LaunchWindow() {
 
 				{/* Source selector */}
 				<button
+					data-testid="launch-source-selector-button"
 					className={`${hudGroupClasses} p-2 ${styles.electronNoDrag}`}
 					onClick={openSourceSelector}
 					disabled={recording}
@@ -522,6 +523,7 @@ export function LaunchWindow() {
 				{/* Audio controls group */}
 				<div className={`${hudGroupClasses} ${styles.electronNoDrag}`}>
 					<button
+						data-testid="launch-system-audio-button"
 						className={`${hudIconBtnClasses} ${systemAudioEnabled ? "drop-shadow-[0_0_4px_rgba(74,222,128,0.4)]" : ""}`}
 						onClick={() => !recording && setSystemAudioEnabled(!systemAudioEnabled)}
 						disabled={recording}
@@ -534,6 +536,7 @@ export function LaunchWindow() {
 							: getIcon("volumeOff", "text-white/40")}
 					</button>
 					<button
+						data-testid="launch-microphone-button"
 						className={`${hudIconBtnClasses} ${microphoneEnabled ? "drop-shadow-[0_0_4px_rgba(74,222,128,0.4)]" : ""}`}
 						onClick={toggleMicrophone}
 						disabled={recording}
@@ -547,6 +550,7 @@ export function LaunchWindow() {
 							: getIcon("micOff", "text-white/40")}
 					</button>
 					<button
+						data-testid="launch-webcam-button"
 						className={`${hudIconBtnClasses} ${webcamEnabled ? "drop-shadow-[0_0_4px_rgba(74,222,128,0.4)]" : ""}`}
 						onClick={async () => {
 							await setWebcamEnabled(!webcamEnabled);
@@ -562,6 +566,7 @@ export function LaunchWindow() {
 
 				{/* Record/Stop group */}
 				<button
+					data-testid="launch-record-button"
 					className={`flex items-center justify-center rounded-full p-2 transition-[min-width,background-color] duration-150 ${recording ? "min-w-[78px]" : "min-w-[36px]"} ${styles.electronNoDrag} ${
 						recording
 							? paused
@@ -614,6 +619,7 @@ export function LaunchWindow() {
 						{/* Open video file */}
 						<Tooltip content={t("tooltips.openVideoFile")}>
 							<button
+								data-testid="launch-open-video-button"
 								className={`${hudIconBtnClasses} ${styles.electronNoDrag}`}
 								onClick={openVideoFile}
 							>
@@ -624,6 +630,7 @@ export function LaunchWindow() {
 						{/* Open project */}
 						<Tooltip content={t("tooltips.openProject")}>
 							<button
+								data-testid="launch-open-project-button"
 								className={`${hudIconBtnClasses} ${styles.electronNoDrag}`}
 								onClick={openProjectFile}
 							>
diff --git a/src/components/launch/SourceSelector.tsx b/src/components/launch/SourceSelector.tsx
index a2aec55e4..c194483d4 100644
--- a/src/components/launch/SourceSelector.tsx
+++ b/src/components/launch/SourceSelector.tsx
@@ -77,6 +77,9 @@ export function SourceSelector() {
 		return (
 			<div
 				key={source.id}
+				data-testid="source-selector-card"
+				data-source-id={source.id}
+				data-source-kind={source.id.startsWith("screen:") ? "screen" : "window"}
 				className={`${styles.sourceCard} ${isSelected ? styles.selected : ""} p-2`}
 				onClick={() => handleSourceSelect(source)}
 			>
@@ -145,6 +148,7 @@ export function SourceSelector() {
 			</div>
 			<div className="p-3 justify-center flex gap-2">
 				<Button
+					data-testid="source-selector-cancel-button"
 					variant="ghost"
 					onClick={() => window.close()}
 					className="px-5 py-1 text-xs text-zinc-400 hover:text-white active:scale-95 transition-transform duration-150 hover:bg-white/5 rounded-full"
@@ -152,6 +156,7 @@ export function SourceSelector() {
 					{tc("actions.cancel")}
 				</Button>
 				<Button
+					data-testid="source-selector-share-button"
 					onClick={handleShare}
 					disabled={!selectedSource}
 					className="px-5 py-1 text-xs bg-[#34B27B] text-white active:scale-95 transition-transform duration-150 hover:bg-[#34B27B]/80 disabled:opacity-30 disabled:bg-zinc-700 rounded-full"
diff --git a/tests/e2e/windows-native-checklist.spec.ts b/tests/e2e/windows-native-checklist.spec.ts
new file mode 100644
index 000000000..865cce27f
--- /dev/null
+++ b/tests/e2e/windows-native-checklist.spec.ts
@@ -0,0 +1,306 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import type { Page } from "@playwright/test";
+import { _electron as electron, expect, test } from "@playwright/test";
+import { NATIVE_BRIDGE_CHANNEL, NATIVE_BRIDGE_VERSION } from "../../src/native/contracts";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ROOT = path.join(__dirname, "../..");
+const MAIN_JS = path.join(ROOT, "dist-electron/main.js");
+const TEST_VIDEO = path.join(__dirname, "../fixtures/sample.webm");
+
+async function launchApp() {
+	const testUserDataDir = fs.mkdtempSync(path.join(os.tmpdir(), "openscreen-e2e-"));
+	const app = await electron.launch({
+		args: [
+			MAIN_JS,
+			"--no-sandbox",
+			"--enable-unsafe-swiftshader",
+			`--user-data-dir=${testUserDataDir}`,
+		],
+		env: {
+			...process.env,
+			ELECTRON_USER_DATA_DIR: testUserDataDir,
+			HEADLESS: process.env["HEADLESS"] ?? "true",
+		},
+	});
+
+	const childProcess = app.process();
+	childProcess.stdout?.on("data", (d) => process.stdout.write(`[electron] ${d}`));
+	childProcess.stderr?.on("data", (d) => process.stderr.write(`[electron] ${d}`));
+	(
+		app as ElectronApplication & {
+			__testUserDataDir?: string;
+			__childProcess?: ReturnType<ElectronApplication["process"]>;
+		}
+	).__testUserDataDir = testUserDataDir;
+	(
+		app as ElectronApplication & {
+			__testUserDataDir?: string;
+			__childProcess?: ReturnType<ElectronApplication["process"]>;
+		}
+	).__childProcess = childProcess;
+
+	return app;
+}
+
+async function closeApp(app: ElectronApplication) {
+	const childProcess = (
+		app as ElectronApplication & {
+			__childProcess?: ReturnType<ElectronApplication["process"]>;
+		}
+	).__childProcess;
+	await Promise.race([app.close(), new Promise<void>((resolve) => setTimeout(resolve, 5_000))]);
+	if (childProcess && !childProcess.killed) {
+		childProcess.kill();
+	}
+	const testUserDataDir = (app as ElectronApplication & { __testUserDataDir?: string })
+		.__testUserDataDir;
+	if (testUserDataDir && fs.existsSync(testUserDataDir)) {
+		fs.rmSync(testUserDataDir, { recursive: true, force: true });
+	}
+}
+
+async function copyFixtureToRecordings(app: ElectronApplication, fileName: string) {
+	const userDataDir = await app.evaluate(({ app: electronApp }) => {
+		return electronApp.getPath("userData");
+	});
+	const recordingsDir = path.join(userDataDir, "recordings");
+	const targetPath = path.join(recordingsDir, fileName);
+	fs.mkdirSync(recordingsDir, { recursive: true });
+	fs.copyFileSync(TEST_VIDEO, targetPath);
+	return targetPath;
+}
+
+async function dismissLanguagePrompt(page: Page) {
+	const keepCurrentLanguage = page
+		.getByRole("button")
+		.filter({ hasText: /Keep current language|Conserver la langue actuelle/ });
+	if ((await keepCurrentLanguage.count()) > 0) {
+		await keepCurrentLanguage.click();
+	}
+}
+
+type ElectronApplication = Awaited<ReturnType<typeof electron.launch>>;
+
+test.describe("Windows native checklist smoke tests", () => {
+	test.skip(process.platform !== "win32", "Windows native capture is Windows-only.");
+
+	test("source selector opens, lists thumbnails, and selects a screen/window source", async () => {
+		const app = await launchApp();
+
+		try {
+			const hudWindow = await app.firstWindow({ timeout: 60_000 });
+			await hudWindow.waitForLoadState("domcontentloaded");
+			await dismissLanguagePrompt(hudWindow);
+
+			await expect(hudWindow.getByTestId("launch-record-button")).toBeDisabled();
+			await expect(hudWindow.getByTestId("launch-source-selector-button")).toBeVisible();
+			await expect(hudWindow.getByTestId("launch-system-audio-button")).toBeEnabled();
+			await expect(hudWindow.getByTestId("launch-microphone-button")).toBeEnabled();
+
+			await hudWindow.getByTestId("launch-source-selector-button").click();
+			const sourceWindow = await app.waitForEvent("window", {
+				predicate: (w) => w.url().includes("windowType=source-selector"),
+				timeout: 15_000,
+			});
+			await sourceWindow.waitForLoadState("domcontentloaded");
+
+			const cards = sourceWindow.getByTestId("source-selector-card");
+			await expect.poll(() => cards.count(), { timeout: 15_000 }).toBeGreaterThan(0);
+
+			const thumbnails = await cards.locator("img").evaluateAll((imgs) =>
+				imgs.map((img) => ({
+					alt: img.getAttribute("alt"),
+					src: img.getAttribute("src"),
+				})),
+			);
+			expect(thumbnails.some((item) => item.alt && item.src?.startsWith("data:image"))).toBe(true);
+
+			const hasScreen = await sourceWindow
+				.locator('[data-testid="source-selector-card"][data-source-kind="screen"]')
+				.count()
+				.then((count) => count > 0);
+			const hasWindow = await sourceWindow
+				.locator('[data-testid="source-selector-card"][data-source-kind="window"]')
+				.count()
+				.then((count) => count > 0);
+			expect(hasScreen || hasWindow).toBe(true);
+
+			await expect(sourceWindow.getByTestId("source-selector-share-button")).toBeDisabled();
+			await cards.first().click();
+			await expect(sourceWindow.getByTestId("source-selector-share-button")).toBeEnabled();
+			await sourceWindow.getByTestId("source-selector-share-button").click();
+
+			await expect
+				.poll(
+					() =>
+						hudWindow.evaluate(async () => {
+							return await window.electronAPI.getSelectedSource();
+						}),
+					{ timeout: 10_000 },
+				)
+				.not.toBeNull();
+			await expect(hudWindow.getByTestId("launch-record-button")).toBeEnabled();
+		} finally {
+			await closeApp(app);
+		}
+	});
+
+	test("launch window opens an existing video into the editor and playback controls respond", async () => {
+		const app = await launchApp();
+		let testVideoInRecordings = "";
+
+		try {
+			const hudWindow = await app.firstWindow({ timeout: 60_000 });
+			await hudWindow.waitForLoadState("domcontentloaded");
+			await dismissLanguagePrompt(hudWindow);
+			testVideoInRecordings = await copyFixtureToRecordings(app, "checklist-sample.webm");
+
+			await app.evaluate(({ ipcMain }, videoPath) => {
+				ipcMain.removeHandler("open-video-file-picker");
+				ipcMain.handle("open-video-file-picker", () => ({
+					success: true,
+					path: videoPath,
+				}));
+			}, testVideoInRecordings);
+
+			await hudWindow.getByTestId("launch-open-video-button").click();
+			const editorWindow = await app.waitForEvent("window", {
+				predicate: (w) => w.url().includes("windowType=editor"),
+				timeout: 15_000,
+			});
+			await editorWindow.waitForLoadState("domcontentloaded");
+			await expect(editorWindow.getByText("Loading video...")).not.toBeVisible({ timeout: 20_000 });
+
+			const playButton = editorWindow.locator(
+				'button[aria-label="Play"], button[aria-label="Lire"]',
+			);
+			await expect(playButton).toBeVisible({ timeout: 10_000 });
+			await playButton.click();
+
+			const seekInput = editorWindow.locator('input[type="range"]').first();
+			await expect(seekInput).toBeVisible();
+			await seekInput.evaluate((input) => {
+				const range = input as HTMLInputElement;
+				range.value = "0.25";
+				range.dispatchEvent(new Event("input", { bubbles: true }));
+				range.dispatchEvent(new Event("change", { bubbles: true }));
+			});
+			await expect.poll(() => seekInput.inputValue(), { timeout: 10_000 }).not.toBe("0");
+
+			await expect(
+				editorWindow.getByText("Background").or(editorWindow.getByText("Arrière-plan")),
+			).toBeVisible();
+			await expect(editorWindow.getByTestId("testId-export-button")).toBeVisible();
+		} finally {
+			await closeApp(app);
+			if (testVideoInRecordings && fs.existsSync(testVideoInRecordings)) {
+				fs.unlinkSync(testVideoInRecordings);
+			}
+		}
+	});
+
+	test("launch window opens an existing project into the editor", async () => {
+		const app = await launchApp();
+		let testVideoInRecordings = "";
+		let projectPath = "";
+
+		try {
+			const hudWindow = await app.firstWindow({ timeout: 60_000 });
+			await hudWindow.waitForLoadState("domcontentloaded");
+			await dismissLanguagePrompt(hudWindow);
+			testVideoInRecordings = await copyFixtureToRecordings(app, "checklist-project-sample.webm");
+			projectPath = path.join(os.tmpdir(), `openscreen-checklist-${Date.now()}.openscreen`);
+			const project = {
+				version: 2,
+				videoPath: testVideoInRecordings,
+				editor: {},
+			};
+			fs.writeFileSync(projectPath, JSON.stringify(project), "utf-8");
+
+			await app.evaluate(
+				({ ipcMain }, payload) => {
+					ipcMain.removeHandler(payload.nativeBridgeChannel);
+					ipcMain.handle(payload.nativeBridgeChannel, (_event, request) => {
+						const success = (data: unknown) => ({
+							ok: true,
+							data,
+							meta: {
+								version: payload.nativeBridgeVersion,
+								requestId: request.requestId ?? "checklist-project-load",
+								timestampMs: Date.now(),
+							},
+						});
+
+						if (request.domain === "project" && request.action === "loadProjectFile") {
+							return success({
+								success: true,
+								path: payload.projectPath,
+								project: payload.project,
+							});
+						}
+						if (request.domain === "project" && request.action === "loadCurrentProjectFile") {
+							return success({ success: false, canceled: true });
+						}
+						if (request.domain === "project" && request.action === "getCurrentVideoPath") {
+							return success({ success: true, path: payload.videoPath });
+						}
+						if (request.domain === "system" && request.action === "getPlatform") {
+							return success("win32");
+						}
+						if (request.domain === "system" && request.action === "getAssetBasePath") {
+							return success(null);
+						}
+						if (request.domain === "cursor" && request.action === "getRecordingData") {
+							return success({ version: 2, provider: "none", samples: [], assets: [] });
+						}
+						if (request.domain === "cursor" && request.action === "getTelemetry") {
+							return success([]);
+						}
+
+						return {
+							ok: false,
+							error: {
+								code: "UNSUPPORTED_ACTION",
+								message: `Unexpected native bridge request in test: ${request.domain}.${request.action}`,
+								retryable: false,
+							},
+							meta: {
+								version: payload.nativeBridgeVersion,
+								requestId: request.requestId ?? "checklist-project-load",
+								timestampMs: Date.now(),
+							},
+						};
+					});
+				},
+				{
+					projectPath,
+					project,
+					videoPath: testVideoInRecordings,
+					nativeBridgeChannel: NATIVE_BRIDGE_CHANNEL,
+					nativeBridgeVersion: NATIVE_BRIDGE_VERSION,
+				},
+			);
+
+			await hudWindow.getByTestId("launch-open-project-button").click();
+			const editorWindow = await app.waitForEvent("window", {
+				predicate: (w) => w.url().includes("windowType=editor"),
+				timeout: 15_000,
+			});
+			await editorWindow.waitForLoadState("domcontentloaded");
+			await expect(editorWindow.getByText("Loading video...")).not.toBeVisible({ timeout: 20_000 });
+			await expect(editorWindow.getByTestId("testId-export-button")).toBeVisible();
+		} finally {
+			await closeApp(app);
+			if (testVideoInRecordings && fs.existsSync(testVideoInRecordings)) {
+				fs.unlinkSync(testVideoInRecordings);
+			}
+			if (projectPath && fs.existsSync(projectPath)) {
+				fs.unlinkSync(projectPath);
+			}
+		}
+	});
+});

From 8a1d7e4a78dbe1f361cc24f0caee7cf1819d8f53 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 20:36:59 +0200
Subject: [PATCH 21/38] fix: resolve selected Windows microphone

---
 electron/ipc/handlers.ts                      |   1 +
 electron/native/README.md                     |  11 +-
 .../wgc-capture/src/audio_sample_utils.cpp    | 126 +++++++++++++-
 .../wgc-capture/src/audio_sample_utils.h      |  18 +-
 electron/native/wgc-capture/src/main.cpp      |  23 ++-
 .../src/wasapi_loopback_capture.cpp           | 161 +++++++++++++++++-
 .../wgc-capture/src/wasapi_loopback_capture.h |   7 +-
 scripts/test-windows-wgc-helper.mjs           |  16 +-
 src/components/launch/LaunchWindow.tsx        |   6 +-
 src/hooks/useScreenRecorder.ts                |   6 +
 src/lib/nativeWindowsRecording.ts             |   1 +
 11 files changed, 355 insertions(+), 21 deletions(-)

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index ae9ba0808..4474bc73c 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -960,6 +960,7 @@ export function registerIpcHandlers(
 					captureSystemAudio: request.audio.system.enabled,
 					captureMic: request.audio.microphone.enabled,
 					microphoneDeviceId: request.audio.microphone.deviceId ?? null,
+					microphoneDeviceName: request.audio.microphone.deviceName ?? null,
 					microphoneGain: request.audio.microphone.gain,
 					webcamEnabled: request.webcam.enabled,
 					webcamDeviceId: request.webcam.deviceId ?? null,
diff --git a/electron/native/README.md b/electron/native/README.md
index 8b3590d2e..659829cd9 100644
--- a/electron/native/README.md
+++ b/electron/native/README.md
@@ -34,6 +34,7 @@ Current V2 JSON shape:
   "captureSystemAudio": false,
   "captureMic": false,
   "microphoneDeviceId": "default",
+  "microphoneDeviceName": "Microphone (NVIDIA Broadcast)",
   "microphoneGain": 1.4,
   "webcamEnabled": true,
   "webcamDeviceId": "default",
@@ -47,7 +48,7 @@ Current V2 JSON shape:
 }
 ```
 
-The current helper implementation supports display/window video capture, system audio loopback, default-microphone capture, Media Foundation webcam capture, and a DirectShow webcam fallback for virtual cameras that are not exposed through Media Foundation. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links, so the renderer passes both `webcamDeviceId` and `webcamDeviceName`. Electron resolves a matching DirectShow filter CLSID for the selected label; the helper uses Media Foundation first, then that exact DirectShow filter when the requested camera is absent from Media Foundation.
+The current helper implementation supports display/window video capture, system audio loopback, selected-microphone capture, Media Foundation webcam capture, and a DirectShow webcam fallback for virtual cameras that are not exposed through Media Foundation. Webcam frames are currently composed into the primary MP4 as a bottom-right picture-in-picture overlay. Browser `deviceId` values do not always map to Media Foundation symbolic links or WASAPI endpoint IDs, so the renderer passes both browser IDs and user-visible device names. For microphones, the helper tries the requested WASAPI endpoint ID first, then resolves an active capture endpoint by `microphoneDeviceName`, then falls back to the default endpoint. For webcams, Electron resolves a matching DirectShow filter CLSID for the selected label; the helper uses Media Foundation first, then that exact DirectShow filter when the requested camera is absent from Media Foundation.
 
 Smoke-test the helper with:
 
@@ -67,3 +68,11 @@ $env:OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME = "NVIDIA Broadcast"
 npm run test:wgc-webcam:win
 Remove-Item Env:OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_NAME
 ```
+
+To validate a specific native microphone manually:
+
+```powershell
+$env:OPENSCREEN_WGC_TEST_MICROPHONE_DEVICE_NAME = "Microphone (NVIDIA Broadcast)"
+npm run test:wgc-mic:win
+Remove-Item Env:OPENSCREEN_WGC_TEST_MICROPHONE_DEVICE_NAME
+```
diff --git a/electron/native/wgc-capture/src/audio_sample_utils.cpp b/electron/native/wgc-capture/src/audio_sample_utils.cpp
index 1e5e1bbc6..a8058c9f6 100644
--- a/electron/native/wgc-capture/src/audio_sample_utils.cpp
+++ b/electron/native/wgc-capture/src/audio_sample_utils.cpp
@@ -25,6 +25,68 @@ T clampTo(double value) {
     return static_cast<T>(std::clamp(std::round(value), minValue, maxValue));
 }
 
+size_t bytesPerSample(const AudioInputFormat& format) {
+    return format.bitsPerSample / 8;
+}
+
+double readSampleAsDouble(const BYTE* source, const AudioInputFormat& format, size_t frameIndex, UINT32 channelIndex) {
+    if (!source || format.blockAlign == 0 || channelIndex >= format.channels) {
+        return 0.0;
+    }
+
+    const size_t offset = frameIndex * format.blockAlign + channelIndex * bytesPerSample(format);
+    if (isFloatFormat(format)) {
+        return static_cast<double>(*reinterpret_cast<const float*>(source + offset));
+    }
+    if (isPcmFormat(format, 16)) {
+        return static_cast<double>(*reinterpret_cast<const int16_t*>(source + offset)) / 32768.0;
+    }
+    if (isPcmFormat(format, 32)) {
+        return static_cast<double>(*reinterpret_cast<const int32_t*>(source + offset)) / 2147483648.0;
+    }
+    return 0.0;
+}
+
+void writeSampleFromDouble(BYTE* destination, const AudioInputFormat& format, size_t frameIndex, UINT32 channelIndex, double value) {
+    if (!destination || format.blockAlign == 0 || channelIndex >= format.channels) {
+        return;
+    }
+
+    const double clamped = std::clamp(value, -1.0, 1.0);
+    const size_t offset = frameIndex * format.blockAlign + channelIndex * bytesPerSample(format);
+    if (isFloatFormat(format)) {
+        *reinterpret_cast<float*>(destination + offset) = static_cast<float>(clamped);
+        return;
+    }
+    if (isPcmFormat(format, 16)) {
+        *reinterpret_cast<int16_t*>(destination + offset) = clampTo<int16_t>(clamped * 32767.0);
+        return;
+    }
+    if (isPcmFormat(format, 32)) {
+        *reinterpret_cast<int32_t*>(destination + offset) = clampTo<int32_t>(clamped * 2147483647.0);
+    }
+}
+
+double readMappedChannel(const BYTE* source, const AudioInputFormat& format, size_t frameIndex, UINT32 targetChannel, UINT32 targetChannels) {
+    if (format.channels == 0) {
+        return 0.0;
+    }
+    if (format.channels == targetChannels && targetChannel < format.channels) {
+        return readSampleAsDouble(source, format, frameIndex, targetChannel);
+    }
+    if (format.channels == 1) {
+        return readSampleAsDouble(source, format, frameIndex, 0);
+    }
+    if (targetChannels == 1) {
+        double sum = 0.0;
+        for (UINT32 channel = 0; channel < format.channels; ++channel) {
+            sum += readSampleAsDouble(source, format, frameIndex, channel);
+        }
+        return sum / static_cast<double>(format.channels);
+    }
+    return readSampleAsDouble(source, format, frameIndex, std::min(targetChannel, format.channels - 1));
+}
+
 } // namespace
 
 constexpr int64_t HnsPerSecond = 10'000'000;
@@ -88,6 +150,53 @@ void copyAudioWithGain(
     std::memcpy(destination.data(), source, byteCount);
 }
 
+void convertAudioWithGain(
+    const BYTE* source,
+    DWORD byteCount,
+    const AudioInputFormat& sourceFormat,
+    const AudioInputFormat& targetFormat,
+    double gain,
+    std::vector<BYTE>& destination) {
+    if (!source || byteCount == 0 || sourceFormat.blockAlign == 0 || targetFormat.blockAlign == 0 ||
+        sourceFormat.sampleRate == 0 || targetFormat.sampleRate == 0 || sourceFormat.channels == 0 ||
+        targetFormat.channels == 0) {
+        destination.clear();
+        return;
+    }
+
+    if (sameAudioFormatForMixing(sourceFormat, targetFormat)) {
+        copyAudioWithGain(source, byteCount, targetFormat, gain, destination);
+        return;
+    }
+
+    const size_t sourceFrames = byteCount / sourceFormat.blockAlign;
+    if (sourceFrames == 0) {
+        destination.clear();
+        return;
+    }
+
+    const double rateRatio = static_cast<double>(targetFormat.sampleRate) /
+        static_cast<double>(sourceFormat.sampleRate);
+    const size_t targetFrames = std::max<size_t>(1, static_cast<size_t>(std::llround(sourceFrames * rateRatio)));
+    destination.assign(targetFrames * targetFormat.blockAlign, 0);
+
+    for (size_t targetFrame = 0; targetFrame < targetFrames; ++targetFrame) {
+        const double sourcePosition = static_cast<double>(targetFrame) / rateRatio;
+        const size_t sourceFrame = std::min(
+            sourceFrames - 1,
+            static_cast<size_t>(std::llround(sourcePosition)));
+        for (UINT32 channel = 0; channel < targetFormat.channels; ++channel) {
+            const double sample = readMappedChannel(
+                source,
+                sourceFormat,
+                sourceFrame,
+                channel,
+                targetFormat.channels);
+            writeSampleFromDouble(destination.data(), targetFormat, targetFrame, channel, sample * gain);
+        }
+    }
+}
+
 void mixAudioInPlace(
     std::vector<BYTE>& destination,
     const BYTE* source,
@@ -133,11 +242,15 @@ void mixAudioInPlace(
 
 AudioMixer::AudioMixer(
     const AudioInputFormat& format,
+    const AudioInputFormat& systemFormat,
+    const AudioInputFormat& microphoneFormat,
     bool includeSystem,
     bool includeMicrophone,
     double microphoneGain,
     OutputCallback output)
     : format_(format),
+      systemFormat_(systemFormat),
+      microphoneFormat_(microphoneFormat),
       includeSystem_(includeSystem),
       includeMicrophone_(includeMicrophone),
       microphoneGain_(microphoneGain),
@@ -187,7 +300,7 @@ void AudioMixer::pushSystem(const BYTE* data, DWORD byteCount) {
 
     {
         std::scoped_lock lock(mutex_);
-        append(systemQueue_, data, byteCount, 1.0);
+        append(systemQueue_, data, byteCount, systemFormat_, 1.0);
     }
     cv_.notify_all();
 }
@@ -199,17 +312,22 @@ void AudioMixer::pushMicrophone(const BYTE* data, DWORD byteCount) {
 
     {
         std::scoped_lock lock(mutex_);
-        append(microphoneQueue_, data, byteCount, microphoneGain_);
+        append(microphoneQueue_, data, byteCount, microphoneFormat_, microphoneGain_);
     }
     cv_.notify_all();
 }
 
-void AudioMixer::append(std::vector<BYTE>& queue, const BYTE* data, DWORD byteCount, double gain) {
+void AudioMixer::append(
+    std::vector<BYTE>& queue,
+    const BYTE* data,
+    DWORD byteCount,
+    const AudioInputFormat& sourceFormat,
+    double gain) {
     if (!data || byteCount == 0) {
         return;
     }
 
-    copyAudioWithGain(data, byteCount, format_, gain, gainBuffer_);
+    convertAudioWithGain(data, byteCount, sourceFormat, format_, gain, gainBuffer_);
     queue.insert(queue.end(), gainBuffer_.begin(), gainBuffer_.end());
 }
 
diff --git a/electron/native/wgc-capture/src/audio_sample_utils.h b/electron/native/wgc-capture/src/audio_sample_utils.h
index b2b682137..81fc62dda 100644
--- a/electron/native/wgc-capture/src/audio_sample_utils.h
+++ b/electron/native/wgc-capture/src/audio_sample_utils.h
@@ -19,6 +19,13 @@ void copyAudioWithGain(
     const AudioInputFormat& format,
     double gain,
     std::vector<BYTE>& destination);
+void convertAudioWithGain(
+    const BYTE* source,
+    DWORD byteCount,
+    const AudioInputFormat& sourceFormat,
+    const AudioInputFormat& targetFormat,
+    double gain,
+    std::vector<BYTE>& destination);
 void mixAudioInPlace(
     std::vector<BYTE>& destination,
     const BYTE* source,
@@ -31,6 +38,8 @@ class AudioMixer {
 
     AudioMixer(
         const AudioInputFormat& format,
+        const AudioInputFormat& systemFormat,
+        const AudioInputFormat& microphoneFormat,
         bool includeSystem,
         bool includeMicrophone,
         double microphoneGain,
@@ -47,11 +56,18 @@ class AudioMixer {
     void pushMicrophone(const BYTE* data, DWORD byteCount);
 
 private:
-    void append(std::vector<BYTE>& queue, const BYTE* data, DWORD byteCount, double gain);
+    void append(
+        std::vector<BYTE>& queue,
+        const BYTE* data,
+        DWORD byteCount,
+        const AudioInputFormat& sourceFormat,
+        double gain);
     bool pop(std::vector<BYTE>& queue, std::vector<BYTE>& chunk, size_t byteCount);
     void mixLoop();
 
     AudioInputFormat format_{};
+    AudioInputFormat systemFormat_{};
+    AudioInputFormat microphoneFormat_{};
     bool includeSystem_ = false;
     bool includeMicrophone_ = false;
     double microphoneGain_ = 1.0;
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 6543d8345..95dce26eb 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -38,6 +38,7 @@ struct CaptureConfig {
     bool captureMic = false;
     bool webcamEnabled = false;
     std::string microphoneDeviceId;
+    std::string microphoneDeviceName;
     double microphoneGain = 1.0;
     std::string webcamDeviceId;
     std::string webcamDeviceName;
@@ -303,6 +304,7 @@ bool parseConfig(const std::string& json, CaptureConfig& config) {
     config.captureMic = findBool(json, "captureMic", false);
     config.webcamEnabled = findBool(json, "webcamEnabled", false);
     config.microphoneDeviceId = findString(json, "microphoneDeviceId");
+    config.microphoneDeviceName = findString(json, "microphoneDeviceName");
     config.microphoneGain = findDouble(json, "microphoneGain", 1.0);
     config.webcamDeviceId = findString(json, "webcamDeviceId");
     config.webcamDeviceName = findString(json, "webcamDeviceName");
@@ -406,24 +408,26 @@ int main(int argc, char* argv[]) {
     WasapiLoopbackCapture loopbackCapture;
     WasapiLoopbackCapture microphoneCapture;
     const AudioInputFormat* audioFormat = nullptr;
+    AudioInputFormat systemAudioFormat{};
+    AudioInputFormat microphoneAudioFormat{};
     if (config.captureSystemAudio) {
         if (!loopbackCapture.initializeSystemLoopback()) {
             std::cerr << "ERROR: Failed to initialize WASAPI loopback capture" << std::endl;
             return 1;
         }
+        systemAudioFormat = loopbackCapture.inputFormat();
         audioFormat = &loopbackCapture.inputFormat();
     }
     if (config.captureMic) {
-        if (!microphoneCapture.initializeMicrophone(utf8ToWide(config.microphoneDeviceId))) {
+        if (!microphoneCapture.initializeMicrophone(
+                utf8ToWide(config.microphoneDeviceId),
+                utf8ToWide(config.microphoneDeviceName))) {
             std::cerr << "ERROR: Failed to initialize WASAPI microphone capture" << std::endl;
             return 1;
         }
+        microphoneAudioFormat = microphoneCapture.inputFormat();
         if (!audioFormat) {
             audioFormat = &microphoneCapture.inputFormat();
-        } else if (!sameAudioFormatForMixing(*audioFormat, microphoneCapture.inputFormat())) {
-            std::cerr << "ERROR: System audio and microphone formats differ; native mixing is not supported yet"
-                      << std::endl;
-            return 1;
         }
     }
     if (audioFormat) {
@@ -431,7 +435,12 @@ int main(int argc, char* argv[]) {
                   << ",\"channels\":" << audioFormat->channels
                   << ",\"bitsPerSample\":" << audioFormat->bitsPerSample
                   << ",\"system\":" << (config.captureSystemAudio ? "true" : "false")
-                  << ",\"microphone\":" << (config.captureMic ? "true" : "false") << "}" << std::endl;
+                  << ",\"microphone\":" << (config.captureMic ? "true" : "false");
+        if (config.captureMic) {
+            std::cout << ",\"microphoneDeviceName\":\""
+                      << jsonEscape(wideToUtf8(microphoneCapture.selectedDeviceName())) << "\"";
+        }
+        std::cout << "}" << std::endl;
     }
 
     MFEncoder encoder;
@@ -549,6 +558,8 @@ int main(int argc, char* argv[]) {
 
         audioMixer = std::make_unique<AudioMixer>(
             *audioFormat,
+            config.captureSystemAudio ? systemAudioFormat : *audioFormat,
+            config.captureMic ? microphoneAudioFormat : *audioFormat,
             config.captureSystemAudio,
             config.captureMic,
             config.microphoneGain,
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
index 4e350a24c..7ff5f278e 100644
--- a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
@@ -1,9 +1,12 @@
 #include "wasapi_loopback_capture.h"
 
+#include <Functiondiscoverykeys_devpkey.h>
 #include <ksmedia.h>
+#include <propvarutil.h>
 
 #include <algorithm>
 #include <chrono>
+#include <cwctype>
 #include <iostream>
 
 namespace {
@@ -41,6 +44,86 @@ GUID audioSubtypeFromFormat(WAVEFORMATEX* format) {
     return GUID_NULL;
 }
 
+std::wstring normalizeDeviceName(const std::wstring& value) {
+    std::wstring result;
+    result.reserve(value.size());
+    bool lastWasSpace = true;
+
+    for (const wchar_t c : value) {
+        if (std::iswalnum(c)) {
+            result.push_back(static_cast<wchar_t>(std::towlower(c)));
+            lastWasSpace = false;
+        } else if (!lastWasSpace) {
+            result.push_back(L' ');
+            lastWasSpace = true;
+        }
+    }
+
+    if (!result.empty() && result.back() == L' ') {
+        result.pop_back();
+    }
+    return result;
+}
+
+int scoreDeviceName(const std::wstring& candidateName, const std::wstring& candidateId, const std::wstring& requestedName) {
+    const std::wstring candidate = normalizeDeviceName(candidateName);
+    const std::wstring id = normalizeDeviceName(candidateId);
+    const std::wstring requested = normalizeDeviceName(requestedName);
+    if (requested.empty()) {
+        return 0;
+    }
+    if (candidate == requested) {
+        return 1000;
+    }
+    if (!candidate.empty() && (candidate.find(requested) != std::wstring::npos || requested.find(candidate) != std::wstring::npos)) {
+        return 900;
+    }
+    if (!id.empty() && (id.find(requested) != std::wstring::npos || requested.find(id) != std::wstring::npos)) {
+        return 800;
+    }
+
+    int score = 0;
+    size_t pos = 0;
+    while (pos < requested.size()) {
+        const size_t end = requested.find(L' ', pos);
+        const std::wstring word = requested.substr(pos, end == std::wstring::npos ? std::wstring::npos : end - pos);
+        if (word.size() > 1 && word != L"microphone" && word != L"mic" && word != L"audio" && word != L"input") {
+            if (candidate.find(word) != std::wstring::npos) {
+                score += 100;
+            } else if (id.find(word) != std::wstring::npos) {
+                score += 50;
+            }
+        }
+        if (end == std::wstring::npos) {
+            break;
+        }
+        pos = end + 1;
+    }
+    return score;
+}
+
+std::wstring getDeviceFriendlyName(IMMDevice* device) {
+    if (!device) {
+        return {};
+    }
+
+    Microsoft::WRL::ComPtr<IPropertyStore> properties;
+    HRESULT hr = device->OpenPropertyStore(STGM_READ, &properties);
+    if (FAILED(hr) || !properties) {
+        return {};
+    }
+
+    PROPVARIANT value;
+    PropVariantInit(&value);
+    hr = properties->GetValue(PKEY_Device_FriendlyName, &value);
+    std::wstring name;
+    if (SUCCEEDED(hr) && value.vt == VT_LPWSTR && value.pwszVal) {
+        name = value.pwszVal;
+    }
+    PropVariantClear(&value);
+    return name;
+}
+
 } // namespace
 
 WasapiLoopbackCapture::~WasapiLoopbackCapture() {
@@ -52,14 +135,14 @@ WasapiLoopbackCapture::~WasapiLoopbackCapture() {
 }
 
 bool WasapiLoopbackCapture::initializeSystemLoopback() {
-    return initialize(WasapiCaptureEndpoint::SystemLoopback, {});
+    return initialize(WasapiCaptureEndpoint::SystemLoopback, {}, {});
 }
 
-bool WasapiLoopbackCapture::initializeMicrophone(const std::wstring& deviceId) {
-    return initialize(WasapiCaptureEndpoint::Microphone, deviceId);
+bool WasapiLoopbackCapture::initializeMicrophone(const std::wstring& deviceId, const std::wstring& deviceName) {
+    return initialize(WasapiCaptureEndpoint::Microphone, deviceId, deviceName);
 }
 
-bool WasapiLoopbackCapture::initialize(WasapiCaptureEndpoint endpoint, const std::wstring& deviceId) {
+bool WasapiLoopbackCapture::initialize(WasapiCaptureEndpoint endpoint, const std::wstring& deviceId, const std::wstring& deviceName) {
     HRESULT hr = CoCreateInstance(
         __uuidof(MMDeviceEnumerator),
         nullptr,
@@ -72,12 +155,19 @@ bool WasapiLoopbackCapture::initialize(WasapiCaptureEndpoint endpoint, const std
     if (endpoint == WasapiCaptureEndpoint::Microphone && !deviceId.empty() && deviceId != L"default") {
         hr = deviceEnumerator_->GetDevice(deviceId.c_str(), &device_);
         if (FAILED(hr)) {
-            std::wcerr << L"WARNING: Could not resolve microphone device id; using default capture endpoint"
+            std::wcerr << L"WARNING: Could not resolve microphone device id directly"
                        << std::endl;
             device_.Reset();
         }
     }
 
+    if (endpoint == WasapiCaptureEndpoint::Microphone && !device_ && !deviceName.empty()) {
+        if (!resolveMicrophoneByName(deviceName)) {
+            std::wcerr << L"WARNING: Could not resolve microphone by name; using default capture endpoint"
+                       << std::endl;
+        }
+    }
+
     if (!device_) {
         const EDataFlow flow =
             endpoint == WasapiCaptureEndpoint::SystemLoopback ? eRender : eCapture;
@@ -87,6 +177,8 @@ bool WasapiLoopbackCapture::initialize(WasapiCaptureEndpoint endpoint, const std
         }
     }
 
+    selectedDeviceName_ = getDeviceFriendlyName(device_.Get());
+
     hr = device_->Activate(__uuidof(IAudioClient), CLSCTX_ALL, nullptr, &audioClient_);
     if (!succeeded(hr, "IMMDevice::Activate(IAudioClient)")) {
         return false;
@@ -123,6 +215,61 @@ bool WasapiLoopbackCapture::initialize(WasapiCaptureEndpoint endpoint, const std
     return true;
 }
 
+bool WasapiLoopbackCapture::resolveMicrophoneByName(const std::wstring& deviceName) {
+    if (!deviceEnumerator_ || deviceName.empty()) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IMMDeviceCollection> devices;
+    HRESULT hr = deviceEnumerator_->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &devices);
+    if (!succeeded(hr, "IMMDeviceEnumerator::EnumAudioEndpoints(eCapture)")) {
+        return false;
+    }
+
+    UINT count = 0;
+    hr = devices->GetCount(&count);
+    if (!succeeded(hr, "IMMDeviceCollection::GetCount")) {
+        return false;
+    }
+
+    Microsoft::WRL::ComPtr<IMMDevice> bestDevice;
+    std::wstring bestId;
+    std::wstring bestName;
+    int bestScore = 0;
+    for (UINT i = 0; i < count; ++i) {
+        Microsoft::WRL::ComPtr<IMMDevice> candidate;
+        hr = devices->Item(i, &candidate);
+        if (FAILED(hr) || !candidate) {
+            continue;
+        }
+
+        LPWSTR rawId = nullptr;
+        std::wstring candidateId;
+        if (SUCCEEDED(candidate->GetId(&rawId)) && rawId) {
+            candidateId = rawId;
+            CoTaskMemFree(rawId);
+        }
+
+        const std::wstring candidateName = getDeviceFriendlyName(candidate.Get());
+        const int score = scoreDeviceName(candidateName, candidateId, deviceName);
+        std::wcerr << L"Native microphone candidate: " << candidateName << L" score=" << score << std::endl;
+        if (score > bestScore) {
+            bestScore = score;
+            bestDevice = candidate;
+            bestId = candidateId;
+            bestName = candidateName;
+        }
+    }
+
+    if (!bestDevice || bestScore <= 0) {
+        return false;
+    }
+
+    device_ = bestDevice;
+    std::wcerr << L"Selected native microphone endpoint: " << bestName << L" id=" << bestId << std::endl;
+    return true;
+}
+
 bool WasapiLoopbackCapture::resolveInputFormat(WAVEFORMATEX* mixFormat) {
     const GUID subtype = audioSubtypeFromFormat(mixFormat);
     if (subtype == GUID_NULL) {
@@ -172,6 +319,10 @@ const AudioInputFormat& WasapiLoopbackCapture::inputFormat() const {
     return inputFormat_;
 }
 
+const std::wstring& WasapiLoopbackCapture::selectedDeviceName() const {
+    return selectedDeviceName_;
+}
+
 void WasapiLoopbackCapture::captureLoop() {
     while (!stopRequested_) {
         UINT32 packetFrames = 0;
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.h b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
index 8d2dbb940..3309cb445 100644
--- a/electron/native/wgc-capture/src/wasapi_loopback_capture.h
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
@@ -30,14 +30,16 @@ class WasapiLoopbackCapture {
     WasapiLoopbackCapture& operator=(const WasapiLoopbackCapture&) = delete;
 
     bool initializeSystemLoopback();
-    bool initializeMicrophone(const std::wstring& deviceId);
+    bool initializeMicrophone(const std::wstring& deviceId, const std::wstring& deviceName);
     bool start(AudioCallback callback);
     void stop();
 
     const AudioInputFormat& inputFormat() const;
+    const std::wstring& selectedDeviceName() const;
 
 private:
-    bool initialize(WasapiCaptureEndpoint endpoint, const std::wstring& deviceId);
+    bool initialize(WasapiCaptureEndpoint endpoint, const std::wstring& deviceId, const std::wstring& deviceName);
+    bool resolveMicrophoneByName(const std::wstring& deviceName);
     void captureLoop();
     bool resolveInputFormat(WAVEFORMATEX* mixFormat);
 
@@ -47,6 +49,7 @@ class WasapiLoopbackCapture {
     Microsoft::WRL::ComPtr<IAudioCaptureClient> captureClient_;
     WAVEFORMATEX* mixFormat_ = nullptr;
     AudioInputFormat inputFormat_{};
+    std::wstring selectedDeviceName_;
     AudioCallback callback_;
     std::thread thread_;
     std::atomic<bool> stopRequested_ = false;
diff --git a/scripts/test-windows-wgc-helper.mjs b/scripts/test-windows-wgc-helper.mjs
index 65b192ebf..82a0a8dac 100644
--- a/scripts/test-windows-wgc-helper.mjs
+++ b/scripts/test-windows-wgc-helper.mjs
@@ -247,7 +247,8 @@ const config = {
 	hasDisplayBounds: true,
 	captureSystemAudio: WITH_SYSTEM_AUDIO,
 	captureMic: WITH_MICROPHONE,
-	microphoneDeviceId: "default",
+	microphoneDeviceId: process.env.OPENSCREEN_WGC_TEST_MICROPHONE_DEVICE_ID ?? "default",
+	microphoneDeviceName: process.env.OPENSCREEN_WGC_TEST_MICROPHONE_DEVICE_NAME ?? "",
 	microphoneGain: 1.4,
 	webcamEnabled: WITH_WEBCAM,
 	webcamDeviceId: process.env.OPENSCREEN_WGC_TEST_WEBCAM_DEVICE_ID ?? "",
@@ -292,9 +293,20 @@ const webcamFormatLine = result.stdout
 	.split(/\r?\n/)
 	.find((line) => line.includes('"event":"webcam-format"'));
 const webcamFormat = webcamFormatLine ? JSON.parse(webcamFormatLine) : null;
+const audioFormatLine = result.stdout
+	.split(/\r?\n/)
+	.find((line) => line.includes('"event":"audio-format"'));
+const audioFormat = audioFormatLine ? JSON.parse(audioFormatLine) : null;
 const nativeWebcamDiagnostics = result.stderr
 	.split(/\r?\n/)
 	.filter((line) => line.includes("Native webcam candidate"));
+const nativeMicrophoneDiagnostics = result.stderr
+	.split(/\r?\n/)
+	.filter(
+		(line) =>
+			line.includes("Native microphone candidate") ||
+			line.includes("Selected native microphone endpoint"),
+	);
 if (!hasVideo) {
 	throw new Error(`WGC helper output has no video stream: ${outputPath}`);
 }
@@ -320,7 +332,9 @@ console.log(
 				codecName: stream.codec_name,
 				duration: stream.duration,
 			})),
+			selectedMicrophoneDeviceName: audioFormat?.microphoneDeviceName,
 			selectedWebcamDeviceName: webcamFormat?.deviceName,
+			nativeMicrophoneDiagnostics,
 			nativeWebcamDiagnostics,
 			firstFrameLuma: frameLuma,
 		},
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 5c8701eb4..489c46e52 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -101,6 +101,7 @@ export function LaunchWindow() {
 		setMicrophoneEnabled,
 		microphoneDeviceId,
 		setMicrophoneDeviceId,
+		setMicrophoneDeviceName,
 		systemAudioEnabled,
 		setSystemAudioEnabled,
 		webcamEnabled,
@@ -168,8 +169,9 @@ export function LaunchWindow() {
 	useEffect(() => {
 		if (selectedMicId && selectedMicId !== "default") {
 			setMicrophoneDeviceId(selectedMicId);
+			setMicrophoneDeviceName(micDevices.find((d) => d.deviceId === selectedMicId)?.label);
 		}
-	}, [selectedMicId, setMicrophoneDeviceId]);
+	}, [selectedMicId, micDevices, setMicrophoneDeviceId, setMicrophoneDeviceName]);
 
 	useEffect(() => {
 		if (selectedCameraId) {
@@ -391,8 +393,10 @@ export function LaunchWindow() {
 								<select
 									value={microphoneDeviceId || selectedMicId}
 									onChange={(e) => {
+										const selectedDevice = micDevices.find((d) => d.deviceId === e.target.value);
 										setSelectedMicId(e.target.value);
 										setMicrophoneDeviceId(e.target.value);
+										setMicrophoneDeviceName(selectedDevice?.label);
 									}}
 									className={`w-full appearance-none bg-white/5 text-white text-[11px] rounded-lg pl-2 pr-6 py-1 border border-white/10 outline-none hover:bg-white/10 transition-colors cursor-pointer ${!micExpanded ? "sr-only" : ""}`}
 								>
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 1496acdaf..031f3e007 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -53,6 +53,8 @@ type UseScreenRecorderReturn = {
 	setMicrophoneEnabled: (enabled: boolean) => void;
 	microphoneDeviceId: string | undefined;
 	setMicrophoneDeviceId: (deviceId: string | undefined) => void;
+	microphoneDeviceName: string | undefined;
+	setMicrophoneDeviceName: (deviceName: string | undefined) => void;
 	webcamDeviceId: string | undefined;
 	setWebcamDeviceId: (deviceId: string | undefined) => void;
 	webcamDeviceName: string | undefined;
@@ -102,6 +104,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const [elapsedSeconds, setElapsedSeconds] = useState(0);
 	const [microphoneEnabled, setMicrophoneEnabled] = useState(false);
 	const [microphoneDeviceId, setMicrophoneDeviceId] = useState<string | undefined>(undefined);
+	const [microphoneDeviceName, setMicrophoneDeviceName] = useState<string | undefined>(undefined);
 	const [webcamDeviceId, setWebcamDeviceId] = useState<string | undefined>(undefined);
 	const [webcamDeviceName, setWebcamDeviceName] = useState<string | undefined>(undefined);
 	const [systemAudioEnabled, setSystemAudioEnabled] = useState(false);
@@ -617,6 +620,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 					microphone: {
 						enabled: microphoneEnabled,
 						deviceId: microphoneDeviceId,
+						deviceName: microphoneDeviceName,
 						gain: MIC_GAIN_BOOST,
 					},
 				},
@@ -1125,6 +1129,8 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		setMicrophoneEnabled,
 		microphoneDeviceId,
 		setMicrophoneDeviceId,
+		microphoneDeviceName,
+		setMicrophoneDeviceName,
 		webcamDeviceId,
 		setWebcamDeviceId,
 		webcamDeviceName,
diff --git a/src/lib/nativeWindowsRecording.ts b/src/lib/nativeWindowsRecording.ts
index ee8ecc86a..c19e819b8 100644
--- a/src/lib/nativeWindowsRecording.ts
+++ b/src/lib/nativeWindowsRecording.ts
@@ -20,6 +20,7 @@ export type NativeWindowsRecordingRequest = {
 		microphone: {
 			enabled: boolean;
 			deviceId?: string;
+			deviceName?: string;
 			gain: number;
 		};
 	};

From d076a9bc785a290f60b4bbaeb146a521fa281a81 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 20:57:52 +0200
Subject: [PATCH 22/38] fix: address native capture review feedback

---
 electron/ipc/handlers.ts                      | 111 +++++++++++++++++-
 electron/ipc/nativeBridge.ts                  |   4 +-
 electron/main.ts                              |  24 ++--
 .../windowsNativeRecordingSession.script.ts   |   6 +-
 .../windowsNativeRecordingSession.ts          |  10 ++
 .../cursor/telemetryCursorAdapter.ts          |   3 +-
 .../native-bridge/services/projectService.ts  |   6 +-
 .../wgc-capture/src/dshow_webcam_capture.cpp  |   7 +-
 electron/native/wgc-capture/src/main.cpp      |  26 +++-
 .../src/wasapi_loopback_capture.cpp           |  36 +++++-
 .../wgc-capture/src/wasapi_loopback_capture.h |   2 +
 src/components/launch/LaunchWindow.tsx        |   6 +-
 src/components/video-editor/SettingsPanel.tsx |   4 +-
 src/components/video-editor/VideoEditor.tsx   |   1 +
 .../video-editor/projectPersistence.ts        |  25 +++-
 .../videoPlayback/cursorRenderer.ts           |   2 +
 src/hooks/useScreenRecorder.ts                |   4 +-
 src/lib/exporter/frameRenderer.ts             |  17 ++-
 tests/e2e/windows-native-checklist.spec.ts    |  22 +++-
 19 files changed, 277 insertions(+), 39 deletions(-)

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 4474bc73c..da49612ed 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -258,6 +258,7 @@ let nativeWindowsCaptureTargetPath: string | null = null;
 let nativeWindowsCaptureWebcamTargetPath: string | null = null;
 let nativeWindowsCaptureRecordingId: number | null = null;
 let nativeWindowsCursorOffsetMs = 0;
+const NATIVE_WINDOWS_CAPTURE_STOP_TIMEOUT_MS = 15_000;
 
 function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 	if (!sample || typeof sample !== "object") {
@@ -679,6 +680,19 @@ function waitForNativeWindowsCaptureStart(proc: ChildProcessWithoutNullStreams)
 
 function waitForNativeWindowsCaptureStop(proc: ChildProcessWithoutNullStreams) {
 	return new Promise<string>((resolve, reject) => {
+		const timer = setTimeout(() => {
+			cleanup();
+			if (!proc.killed) {
+				proc.kill();
+			}
+			reject(
+				new Error(
+					`Timed out waiting for native Windows capture to stop. Output path: ${
+						nativeWindowsCaptureTargetPath ?? "unknown"
+					}. Output: ${nativeWindowsCaptureOutput.trim()}`,
+				),
+			);
+		}, NATIVE_WINDOWS_CAPTURE_STOP_TIMEOUT_MS);
 		const onOutput = (chunk: Buffer) => {
 			nativeWindowsCaptureOutput += chunk.toString();
 		};
@@ -705,6 +719,7 @@ function waitForNativeWindowsCaptureStop(proc: ChildProcessWithoutNullStreams) {
 			reject(error);
 		};
 		const cleanup = () => {
+			clearTimeout(timer);
 			proc.stdout.off("data", onOutput);
 			proc.stderr.off("data", onOutput);
 			proc.off("close", onClose);
@@ -742,6 +757,78 @@ function setCurrentRecordingSessionState(session: RecordingSession | null) {
 	currentVideoPath = session?.screenVideoPath ?? null;
 }
 
+function getSessionManifestPathForVideo(videoPath: string) {
+	const parsedPath = path.parse(videoPath);
+	const baseName = parsedPath.name.endsWith("-webcam")
+		? parsedPath.name.slice(0, -"-webcam".length)
+		: parsedPath.name;
+	return path.join(parsedPath.dir, `${baseName}${RECORDING_SESSION_SUFFIX}`);
+}
+
+async function loadRecordedSessionForVideoPath(
+	videoPath: string,
+): Promise<RecordingSession | null> {
+	try {
+		const manifestPath = getSessionManifestPathForVideo(videoPath);
+		if (!isPathAllowed(manifestPath)) {
+			const parsedVideoPath = path.parse(videoPath);
+			if (!isPathWithinDir(path.resolve(manifestPath), parsedVideoPath.dir)) {
+				return null;
+			}
+		}
+
+		const content = await fs.readFile(manifestPath, "utf-8");
+		const session = normalizeRecordingSession(JSON.parse(content));
+		if (!session) {
+			return null;
+		}
+
+		const normalizedVideoPath = normalizePath(videoPath);
+		const matchesScreen = normalizePath(session.screenVideoPath) === normalizedVideoPath;
+		const matchesWebcam =
+			typeof session.webcamVideoPath === "string" &&
+			normalizePath(session.webcamVideoPath) === normalizedVideoPath;
+		if (!matchesScreen && !matchesWebcam) {
+			return null;
+		}
+
+		if (!isPathAllowed(session.screenVideoPath)) {
+			const approvedScreen = await approveReadableVideoPath(session.screenVideoPath, [
+				path.dirname(manifestPath),
+				RECORDINGS_DIR,
+			]);
+			if (!approvedScreen) {
+				return null;
+			}
+			session.screenVideoPath = approvedScreen;
+		}
+
+		if (session.webcamVideoPath && !isPathAllowed(session.webcamVideoPath)) {
+			const approvedWebcam = await approveReadableVideoPath(session.webcamVideoPath, [
+				path.dirname(manifestPath),
+				RECORDINGS_DIR,
+			]);
+			if (!approvedWebcam) {
+				session.webcamVideoPath = undefined;
+			} else {
+				session.webcamVideoPath = approvedWebcam;
+			}
+		}
+
+		approveFilePath(session.screenVideoPath);
+		if (session.webcamVideoPath) {
+			approveFilePath(session.webcamVideoPath);
+		}
+		return session;
+	} catch (error) {
+		const nodeError = error as NodeJS.ErrnoException;
+		if (nodeError.code !== "ENOENT") {
+			console.error("Failed to restore recording session manifest:", error);
+		}
+		return null;
+	}
+}
+
 export function registerIpcHandlers(
 	createEditorWindow: () => void,
 	createSourceSelectorWindow: () => BrowserWindow,
@@ -1548,7 +1635,7 @@ export function registerIpcHandlers(
 		}
 	}
 
-	ipcMain.handle("set-current-video-path", (_, path: string) => {
+	ipcMain.handle("set-current-video-path", async (_, path: string) => {
 		return setCurrentVideoPath(path);
 	});
 
@@ -1566,10 +1653,26 @@ export function registerIpcHandlers(
 			: { success: false };
 	});
 
-	function setCurrentVideoPath(path: string): ProjectPathResult {
-		currentVideoPath = normalizeVideoSourcePath(path) ?? path;
+	async function setCurrentVideoPath(path: string): Promise<ProjectPathResult> {
+		const normalizedPath = normalizeVideoSourcePath(path);
+		if (!normalizedPath || !isPathAllowed(normalizedPath)) {
+			return {
+				success: false,
+				message: "Video path has not been approved",
+			};
+		}
+
+		const restoredSession = await loadRecordedSessionForVideoPath(normalizedPath);
+		if (restoredSession) {
+			setCurrentRecordingSessionState(restoredSession);
+		} else {
+			setCurrentRecordingSessionState({
+				screenVideoPath: normalizedPath,
+				createdAt: Date.now(),
+			});
+		}
 		currentProjectPath = null;
-		return { success: true };
+		return { success: true, path: currentVideoPath ?? normalizedPath };
 	}
 
 	ipcMain.handle("get-current-video-path", () => {
diff --git a/electron/ipc/nativeBridge.ts b/electron/ipc/nativeBridge.ts
index ba6258a30..7f7b24b51 100644
--- a/electron/ipc/nativeBridge.ts
+++ b/electron/ipc/nativeBridge.ts
@@ -27,7 +27,7 @@ export interface NativeBridgeContext {
 	) => Promise<ProjectFileResult>;
 	loadProjectFile: () => Promise<ProjectFileResult>;
 	loadCurrentProjectFile: () => Promise<ProjectFileResult>;
-	setCurrentVideoPath: (path: string) => ProjectPathResult;
+	setCurrentVideoPath: (path: string) => ProjectPathResult | Promise<ProjectPathResult>;
 	getCurrentVideoPathResult: () => ProjectPathResult;
 	clearCurrentVideoPath: () => ProjectPathResult;
 	resolveAssetBasePath: () => string | null;
@@ -171,7 +171,7 @@ export function registerNativeBridgeHandlers(context: NativeBridgeContext) {
 						case "setCurrentVideoPath":
 							return createSuccessResponse(
 								requestId,
-								projectService.setCurrentVideoPath(request.payload.path),
+								await projectService.setCurrentVideoPath(request.payload.path),
 							);
 						case "getCurrentVideoPath":
 							return createSuccessResponse(requestId, projectService.getCurrentVideoPath());
diff --git a/electron/main.ts b/electron/main.ts
index 3e237eb58..059db0700 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -387,18 +387,20 @@ app.whenReady().then(async () => {
 
 	// Intercept getDisplayMedia to return the pre-selected source without the cursor.
 	// The source is cached synchronously at select-source time to avoid async delays here.
-	session.defaultSession.setDisplayMediaRequestHandler((_request, callback) => {
-		const source = getSelectedDesktopSource();
-		if (!source) {
-			callback({});
-			return;
-		}
-		callback({
-			video: source,
-			// WASAPI loopback provides system audio capture on Windows.
-			...(process.platform === "win32" && { audio: "loopback" as const }),
+	if (process.platform === "win32") {
+		session.defaultSession.setDisplayMediaRequestHandler((_request, callback) => {
+			const source = getSelectedDesktopSource();
+			if (!source) {
+				callback({});
+				return;
+			}
+			callback({
+				video: source,
+				// WASAPI loopback provides system audio capture on Windows.
+				audio: "loopback",
+			});
 		});
-	});
+	}
 
 	// Allow microphone/media permission checks
 	session.defaultSession.setPermissionCheckHandler((_webContents, permission) => {
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index f97105e0d..ac4a211ef 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -1,9 +1,13 @@
 export function buildPowerShellCommand(sampleIntervalMs: number, windowHandle?: string | null) {
+	const targetWindowHandle =
+		typeof windowHandle === "string" && /^(?:0x[0-9a-fA-F]+|\d+)$/.test(windowHandle)
+			? `'${windowHandle}'`
+			: "$null";
 	const script = String.raw`
 $ErrorActionPreference = 'Stop'
 Add-Type -AssemblyName System.Drawing
 
-$targetWindowHandle = ${windowHandle ? `'${windowHandle}'` : "$null"}
+$targetWindowHandle = ${targetWindowHandle}
 
 $source = @"
 using System;
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index 6edee5a37..6dc0253f1 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -151,6 +151,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		if (payload.type === "error") {
 			this.logDiagnostic("helper-error", { message: payload.message });
 			console.error("Windows cursor helper error:", payload.message);
+			this.failHelper(new Error(payload.message));
 			return;
 		}
 
@@ -256,6 +257,15 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		reject?.(error);
 	}
 
+	private failHelper(error: Error) {
+		this.rejectReady(error);
+		const child = this.process;
+		this.process = null;
+		if (child && !child.killed) {
+			child.kill();
+		}
+	}
+
 	private clearReadyState() {
 		if (this.readyTimer) {
 			clearTimeout(this.readyTimer);
diff --git a/electron/native-bridge/cursor/telemetryCursorAdapter.ts b/electron/native-bridge/cursor/telemetryCursorAdapter.ts
index d0839952c..073b18316 100644
--- a/electron/native-bridge/cursor/telemetryCursorAdapter.ts
+++ b/electron/native-bridge/cursor/telemetryCursorAdapter.ts
@@ -38,7 +38,8 @@ export class TelemetryCursorAdapter implements CursorNativeAdapter {
 		const resolvedVideoPath = this.options.resolveVideoPath(videoPath);
 		if (!resolvedVideoPath) {
 			return {
-				success: true,
+				success: false,
+				message: "No video path is available for cursor telemetry",
 				samples: [],
 			} satisfies CursorTelemetryLoadResult;
 		}
diff --git a/electron/native-bridge/services/projectService.ts b/electron/native-bridge/services/projectService.ts
index e8d1cd5cf..965b4fb70 100644
--- a/electron/native-bridge/services/projectService.ts
+++ b/electron/native-bridge/services/projectService.ts
@@ -16,7 +16,7 @@ interface ProjectServiceOptions {
 	) => Promise<ProjectFileResult>;
 	loadProjectFile: () => Promise<ProjectFileResult>;
 	loadCurrentProjectFile: () => Promise<ProjectFileResult>;
-	setCurrentVideoPath: (path: string) => ProjectPathResult;
+	setCurrentVideoPath: (path: string) => ProjectPathResult | Promise<ProjectPathResult>;
 	getCurrentVideoPathResult: () => ProjectPathResult;
 	clearCurrentVideoPath: () => ProjectPathResult;
 }
@@ -60,8 +60,8 @@ export class ProjectService {
 		return result;
 	}
 
-	setCurrentVideoPath(path: string) {
-		const result = this.options.setCurrentVideoPath(path);
+	async setCurrentVideoPath(path: string) {
+		const result = await this.options.setCurrentVideoPath(path);
 		this.getCurrentContext();
 		return result;
 	}
diff --git a/electron/native/wgc-capture/src/dshow_webcam_capture.cpp b/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
index 535bf7ee9..6e0ec4f8f 100644
--- a/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
+++ b/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
@@ -256,6 +256,7 @@ bool DirectShowWebcamCapture::initialize(
     int requestedFps) {
     stop();
     delete impl_;
+    impl_ = nullptr;
     impl_ = new Impl();
     fps_ = std::clamp(requestedFps > 0 ? requestedFps : 30, 1, 60);
 
@@ -402,7 +403,7 @@ void DirectShowWebcamCapture::stop() {
 }
 
 void DirectShowWebcamCapture::captureLoop() {
-    CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+    const HRESULT coinitHr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
     while (!stopRequested_ && impl_ && impl_->sampleGrabber) {
         long bufferSize = 0;
         HRESULT hr = impl_->sampleGrabber->GetCurrentBuffer(&bufferSize, nullptr);
@@ -415,7 +416,9 @@ void DirectShowWebcamCapture::captureLoop() {
         }
         std::this_thread::sleep_for(std::chrono::milliseconds(1000 / std::max(1, fps_)));
     }
-    CoUninitialize();
+    if (SUCCEEDED(coinitHr)) {
+        CoUninitialize();
+    }
 }
 
 void DirectShowWebcamCapture::storeFrame(const BYTE* buffer, long length) {
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 95dce26eb..70aec1a9a 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -463,13 +463,14 @@ int main(int argc, char* argv[]) {
     std::atomic<bool> firstFrameWritten = false;
     std::atomic<bool> encodeFailed = false;
     Microsoft::WRL::ComPtr<ID3D11Texture2D> latestFrameTexture;
+    int64_t latestFrameTimestampHns = 0;
+    int64_t firstFrameTimestampHns = -1;
     std::vector<BYTE> latestWebcamFrame;
     int latestWebcamWidth = 0;
     int latestWebcamHeight = 0;
     bool hasVisibleWebcamFrame = false;
 
     session.setFrameCallback([&](ID3D11Texture2D* texture, int64_t timestampHns) {
-        (void)timestampHns;
         if (stopRequested) {
             return;
         }
@@ -490,6 +491,7 @@ int main(int argc, char* argv[]) {
         }
 
         session.context()->CopyResource(latestFrameTexture.Get(), texture);
+        latestFrameTimestampHns = timestampHns;
         if (!firstFrameWritten.exchange(true)) {
             cv.notify_all();
         }
@@ -498,6 +500,7 @@ int main(int argc, char* argv[]) {
     auto writeVideoFrames = [&]() {
         const auto startedAt = std::chrono::steady_clock::now();
         uint64_t frameIndex = 0;
+        int64_t lastEncodedVideoTimestampHns = -1;
 
         while (!stopRequested && !encodeFailed) {
             {
@@ -519,15 +522,32 @@ int main(int argc, char* argv[]) {
                     latestWebcamWidth,
                     latestWebcamHeight,
                 };
+                const int64_t syntheticTimestampHns =
+                    static_cast<int64_t>((frameIndex * 10'000'000ULL) / config.fps);
+                const int64_t sourceTimestampHns =
+                    latestFrameTimestampHns > 0 ? latestFrameTimestampHns : syntheticTimestampHns;
+                if (firstFrameTimestampHns < 0) {
+                    firstFrameTimestampHns = sourceTimestampHns;
+                }
+                int64_t frameTimestampHns =
+                    std::max<int64_t>(0, sourceTimestampHns - firstFrameTimestampHns);
+                if (lastEncodedVideoTimestampHns >= 0 &&
+                    frameTimestampHns <= lastEncodedVideoTimestampHns) {
+                    frameTimestampHns =
+                        lastEncodedVideoTimestampHns + static_cast<int64_t>(10'000'000ULL / config.fps);
+                }
                 if (latestFrameTexture && !encoder.writeFrame(
                         latestFrameTexture.Get(),
-                        static_cast<int64_t>((frameIndex * 10'000'000ULL) / config.fps),
+                        frameTimestampHns,
                         webcamFrame.data ? &webcamFrame : nullptr)) {
                     encodeFailed = true;
                     stopRequested = true;
                     cv.notify_all();
                     return;
                 }
+                if (latestFrameTexture) {
+                    lastEncodedVideoTimestampHns = frameTimestampHns;
+                }
             }
 
             frameIndex += 1;
@@ -714,7 +734,7 @@ int main(int argc, char* argv[]) {
     }
 
     if (stdinThread.joinable()) {
-        stdinThread.join();
+        stdinThread.detach();
     }
 
     if (encodeFailed) {
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
index 7ff5f278e..0256b0425 100644
--- a/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.cpp
@@ -293,6 +293,8 @@ bool WasapiLoopbackCapture::start(AudioCallback callback) {
     callback_ = std::move(callback);
     stopRequested_ = false;
     writtenFrames_ = 0;
+    lastDevicePositionEnd_ = 0;
+    hasLastDevicePosition_ = false;
 
     HRESULT hr = audioClient_->Start();
     if (!succeeded(hr, "IAudioClient::Start")) {
@@ -324,6 +326,22 @@ const std::wstring& WasapiLoopbackCapture::selectedDeviceName() const {
 }
 
 void WasapiLoopbackCapture::captureLoop() {
+    auto emitSilenceFrames = [&](uint64_t frames, int64_t timestampHns) {
+        constexpr uint64_t MaxSilenceChunkFrames = 4800;
+        uint64_t remainingFrames = frames;
+        int64_t currentTimestampHns = timestampHns;
+        while (remainingFrames > 0 && !stopRequested_) {
+            const uint64_t chunkFrames = std::min<uint64_t>(remainingFrames, MaxSilenceChunkFrames);
+            const DWORD chunkBytes = static_cast<DWORD>(chunkFrames * inputFormat_.blockAlign);
+            const int64_t chunkDurationHns =
+                static_cast<int64_t>((chunkFrames * HnsPerSecond) / inputFormat_.sampleRate);
+            silenceBuffer_.assign(chunkBytes, 0);
+            callback_(silenceBuffer_.data(), chunkBytes, currentTimestampHns, chunkDurationHns);
+            remainingFrames -= chunkFrames;
+            currentTimestampHns += chunkDurationHns;
+        }
+    };
+
     while (!stopRequested_) {
         UINT32 packetFrames = 0;
         HRESULT hr = captureClient_->GetNextPacketSize(&packetFrames);
@@ -337,17 +355,29 @@ void WasapiLoopbackCapture::captureLoop() {
             BYTE* data = nullptr;
             UINT32 framesAvailable = 0;
             DWORD flags = 0;
+            UINT64 devicePosition = 0;
+            UINT64 qpcPosition = 0;
 
-            hr = captureClient_->GetBuffer(&data, &framesAvailable, &flags, nullptr, nullptr);
+            hr = captureClient_->GetBuffer(&data, &framesAvailable, &flags, &devicePosition, &qpcPosition);
             if (FAILED(hr)) {
                 std::cerr << "ERROR: IAudioCaptureClient::GetBuffer failed (hr=0x" << std::hex
                           << hr << std::dec << ")" << std::endl;
                 break;
             }
 
+            (void)qpcPosition;
+            if (hasLastDevicePosition_ && devicePosition > lastDevicePositionEnd_) {
+                const uint64_t gapFrames = devicePosition - lastDevicePositionEnd_;
+                if ((flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) != 0 || gapFrames > framesAvailable) {
+                    const int64_t gapTimestampHns =
+                        static_cast<int64_t>((lastDevicePositionEnd_ * HnsPerSecond) / inputFormat_.sampleRate);
+                    emitSilenceFrames(gapFrames, gapTimestampHns);
+                }
+            }
+
             const DWORD byteCount = framesAvailable * inputFormat_.blockAlign;
             const int64_t timestampHns =
-                static_cast<int64_t>((writtenFrames_ * HnsPerSecond) / inputFormat_.sampleRate);
+                static_cast<int64_t>((devicePosition * HnsPerSecond) / inputFormat_.sampleRate);
             const int64_t durationHns =
                 static_cast<int64_t>((static_cast<uint64_t>(framesAvailable) * HnsPerSecond) /
                                      inputFormat_.sampleRate);
@@ -362,6 +392,8 @@ void WasapiLoopbackCapture::captureLoop() {
             }
 
             writtenFrames_ += framesAvailable;
+            lastDevicePositionEnd_ = devicePosition + framesAvailable;
+            hasLastDevicePosition_ = true;
             captureClient_->ReleaseBuffer(framesAvailable);
 
             hr = captureClient_->GetNextPacketSize(&packetFrames);
diff --git a/electron/native/wgc-capture/src/wasapi_loopback_capture.h b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
index 3309cb445..5c5f2b7c0 100644
--- a/electron/native/wgc-capture/src/wasapi_loopback_capture.h
+++ b/electron/native/wgc-capture/src/wasapi_loopback_capture.h
@@ -55,4 +55,6 @@ class WasapiLoopbackCapture {
     std::atomic<bool> stopRequested_ = false;
     std::vector<BYTE> silenceBuffer_;
     uint64_t writtenFrames_ = 0;
+    uint64_t lastDevicePositionEnd_ = 0;
+    bool hasLastDevicePosition_ = false;
 };
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 489c46e52..8fb22db65 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -294,7 +294,11 @@ export function LaunchWindow() {
 		}
 
 		if (result.success && result.path) {
-			await nativeBridgeClient.project.setCurrentVideoPath(result.path);
+			const setVideoPathResult = await nativeBridgeClient.project.setCurrentVideoPath(result.path);
+			if (!setVideoPathResult.success) {
+				console.error("Failed to set current video path:", setVideoPathResult);
+				return;
+			}
 			await window.electronAPI.switchToEditor();
 		}
 	};
diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsx
index 297fc31c0..f5fa63218 100644
--- a/src/components/video-editor/SettingsPanel.tsx
+++ b/src/components/video-editor/SettingsPanel.tsx
@@ -253,6 +253,7 @@ interface SettingsPanelProps {
 	onCursorClickBounceChange?: (bounce: number) => void;
 	hasCursorData?: boolean;
 	showCursorSettings?: boolean;
+	showCursorHighlightSettings?: boolean;
 }
 
 export default SettingsPanel;
@@ -352,6 +353,7 @@ export function SettingsPanel({
 	onCursorClickBounceChange,
 	hasCursorData = false,
 	showCursorSettings = true,
+	showCursorHighlightSettings = true,
 }: SettingsPanelProps) {
 	const t = useScopedT("settings");
 	// Resolved URLs are for DOM rendering only (backgroundImage). The canonical
@@ -1052,7 +1054,7 @@ export function SettingsPanel({
 								</div>
 							</div>
 
-							{showCursorSettings && cursorHighlight && onCursorHighlightChange && (
+							{showCursorHighlightSettings && cursorHighlight && onCursorHighlightChange && (
 								<div className="p-2 rounded-lg bg-white/5 border border-white/5 mt-2 space-y-2">
 									<div className="flex items-center justify-between">
 										<div className="text-[10px] font-medium text-slate-300">Cursor highlight</div>
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 175057f47..d1a1ec15c 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -2143,6 +2143,7 @@ export default function VideoEditor() {
 						onCursorClickBounceChange={setCursorClickBounce}
 						hasCursorData={cursorTelemetry.length > 0}
 						showCursorSettings={showCursorSettings}
+						showCursorHighlightSettings={isMac}
 					/>
 				</div>
 			</div>
diff --git a/src/components/video-editor/projectPersistence.ts b/src/components/video-editor/projectPersistence.ts
index 16fc09073..3e0f635be 100644
--- a/src/components/video-editor/projectPersistence.ts
+++ b/src/components/video-editor/projectPersistence.ts
@@ -118,12 +118,33 @@ function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
+function encodePathSegments(pathname: string, keepWindowsDrive = false): string {
+	return pathname
+		.split("/")
+		.map((segment, index) => {
+			if (!segment) {
+				return segment;
+			}
+			if (keepWindowsDrive && index === 0 && /^[a-zA-Z]:$/.test(segment)) {
+				return segment;
+			}
+			return encodeURIComponent(segment);
+		})
+		.join("/");
+}
+
 export function toFileUrl(filePath: string): string {
 	const normalized = filePath.replace(/\\/g, "/");
 	if (normalized.match(/^[a-zA-Z]:/)) {
-		return `file:///${encodeURI(normalized)}`;
+		return `file:///${encodePathSegments(normalized, true)}`;
+	}
+	if (normalized.startsWith("//")) {
+		const withoutPrefix = normalized.slice(2);
+		const [host = "", ...segments] = withoutPrefix.split("/");
+		return `file://${host}/${encodePathSegments(segments.join("/"))}`;
 	}
-	return `file://${encodeURI(normalized)}`;
+	const absolutePath = normalized.startsWith("/") ? normalized : `/${normalized}`;
+	return `file://${encodePathSegments(absolutePath)}`;
 }
 
 export function fromFileUrl(fileUrl: string): string {
diff --git a/src/components/video-editor/videoPlayback/cursorRenderer.ts b/src/components/video-editor/videoPlayback/cursorRenderer.ts
index 7b912c541..dd3087bd2 100644
--- a/src/components/video-editor/videoPlayback/cursorRenderer.ts
+++ b/src/components/video-editor/videoPlayback/cursorRenderer.ts
@@ -721,6 +721,8 @@ export class PixiCursorOverlay {
 		}
 		this.cursorMotionBlurFilter.destroy();
 		this.container.destroy({ children: true });
+		cursorAssetsPromise = null;
+		loadedCursorAssets = {};
 	}
 }
 
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 031f3e007..46340377f 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -644,7 +644,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 				finalizing: false,
 			};
 			accumulatedDurationMs.current = 0;
-			segmentStartedAt.current = result.recordingId;
+			segmentStartedAt.current = Date.now();
 			allowAutoFinalize.current = true;
 			setRecording(true);
 			setPaused(false);
@@ -918,7 +918,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			}
 
 			accumulatedDurationMs.current = 0;
-			segmentStartedAt.current = activeRecordingId;
+			segmentStartedAt.current = Date.now();
 			allowAutoFinalize.current = true;
 			setRecording(true);
 			setPaused(false);
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index eaee4c9f9..456980c04 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -146,6 +146,7 @@ export class FrameRenderer {
 	private threeDPass: ThreeDPass | null = null;
 	private currentRotation3D: Rotation3D = { ...DEFAULT_ROTATION_3D };
 	private cursorImageCache = new Map<string, HTMLImageElement>();
+	private warnedKeys = new Set<string>();
 	private config: FrameRenderConfig;
 	private animationState: AnimationState;
 	private layoutCache: LayoutCache | null = null;
@@ -586,7 +587,13 @@ export class FrameRenderer {
 			1,
 			activeNativeCursor.sample,
 		);
-		const image = await this.getCursorImage(renderAsset);
+		let image: HTMLImageElement;
+		try {
+			image = await this.getCursorImage(renderAsset);
+		} catch (error) {
+			this.warnOnce("native-cursor-image-load", "Failed to load native cursor asset", error);
+			return;
+		}
 		const scale = Math.max(0, this.config.cursorScale ?? 1);
 		const appliedScale = this.animationState.appliedScale;
 		const canvasX = projectedPoint.x * appliedScale + this.animationState.x;
@@ -617,6 +624,14 @@ export class FrameRenderer {
 		return image;
 	}
 
+	private warnOnce(key: string, message: string, error: unknown) {
+		if (this.warnedKeys.has(key)) {
+			return;
+		}
+		this.warnedKeys.add(key);
+		console.warn(`[FrameRenderer] ${message}:`, error);
+	}
+
 	private updateLayout(webcamFrame?: VideoFrame | null): void {
 		if (!this.app || !this.videoSprite || !this.maskGraphics || !this.videoContainer) return;
 
diff --git a/tests/e2e/windows-native-checklist.spec.ts b/tests/e2e/windows-native-checklist.spec.ts
index 865cce27f..d19a1fd64 100644
--- a/tests/e2e/windows-native-checklist.spec.ts
+++ b/tests/e2e/windows-native-checklist.spec.ts
@@ -1,3 +1,4 @@
+import { once } from "node:events";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -18,12 +19,16 @@ async function launchApp() {
 			MAIN_JS,
 			"--no-sandbox",
 			"--enable-unsafe-swiftshader",
+			"--lang=en-US",
 			`--user-data-dir=${testUserDataDir}`,
 		],
 		env: {
 			...process.env,
 			ELECTRON_USER_DATA_DIR: testUserDataDir,
 			HEADLESS: process.env["HEADLESS"] ?? "true",
+			LANG: "en_US.UTF-8",
+			LC_ALL: "en_US.UTF-8",
+			LANGUAGE: "en_US",
 		},
 	});
 
@@ -53,13 +58,24 @@ async function closeApp(app: ElectronApplication) {
 		}
 	).__childProcess;
 	await Promise.race([app.close(), new Promise<void>((resolve) => setTimeout(resolve, 5_000))]);
-	if (childProcess && !childProcess.killed) {
-		childProcess.kill();
+	if (childProcess && childProcess.exitCode === null && childProcess.signalCode === null) {
+		if (!childProcess.killed) {
+			childProcess.kill();
+		}
+		await Promise.race([
+			once(childProcess, "close"),
+			new Promise<void>((resolve) => setTimeout(resolve, 5_000)),
+		]);
 	}
 	const testUserDataDir = (app as ElectronApplication & { __testUserDataDir?: string })
 		.__testUserDataDir;
 	if (testUserDataDir && fs.existsSync(testUserDataDir)) {
-		fs.rmSync(testUserDataDir, { recursive: true, force: true });
+		fs.rmSync(testUserDataDir, {
+			recursive: true,
+			force: true,
+			maxRetries: 5,
+			retryDelay: 100,
+		});
 	}
 }
 

From 1c921108c914820a73757450e5dec68c156fae3a Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 21:13:02 +0200
Subject: [PATCH 23/38] feat: apply native cursor visual effects

---
 .../windowsNativeRecordingSession.script.ts   |   5 +
 .../windowsNativeRecordingSession.ts          |  11 ++
 .../windowsNativeRecordingSession.types.ts    |   1 +
 scripts/test-windows-native-cursor.mjs        |  42 +++-
 src/components/video-editor/VideoEditor.tsx   |   9 +
 src/components/video-editor/VideoPlayback.tsx |  47 ++++-
 src/lib/cursor/nativeCursor.ts                | 179 +++++++++++++++++-
 src/lib/exporter/frameRenderer.ts             |  50 ++++-
 src/lib/exporter/gifExporter.ts               |   8 +-
 src/lib/exporter/videoExporter.ts             |   8 +-
 src/native/contracts.ts                       |   1 +
 11 files changed, 342 insertions(+), 19 deletions(-)

diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index ac4a211ef..e1484a854 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -50,6 +50,9 @@ public static class OpenScreenCursorInterop {
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetCursorInfo(ref CURSORINFO pci);
 
+	[DllImport("user32.dll")]
+	public static extern short GetAsyncKeyState(int vKey);
+
 	[DllImport("user32.dll", SetLastError = true)]
 	public static extern IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
 
@@ -276,6 +279,7 @@ while ($true) {
     $visible = ($cursorInfo.flags -band 1) -ne 0
     $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
     $cursorType = Get-StandardCursorType $cursorInfo.hCursor
+    $leftButtonDown = ([OpenScreenCursorInterop]::GetAsyncKeyState(0x01) -band 0x8000) -ne 0
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
@@ -296,6 +300,7 @@ while ($true) {
         visible = $visible
         handle = $cursorId
         cursorType = $cursorType
+        leftButtonDown = $leftButtonDown
 		bounds = Get-TargetBounds
         asset = $asset
     }
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index 6dc0253f1..1b6355a39 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -32,6 +32,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 	private readyTimer: NodeJS.Timeout | null = null;
 	private sampleCount = 0;
 	private outOfBoundsSampleCount = 0;
+	private previousLeftButtonDown = false;
 
 	constructor(private readonly options: WindowsNativeRecordingSessionOptions) {}
 
@@ -42,6 +43,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		this.startTimeMs = this.options.startTimeMs ?? Date.now();
 		this.sampleCount = 0;
 		this.outOfBoundsSampleCount = 0;
+		this.previousLeftButtonDown = false;
 
 		const encodedCommand = buildPowerShellCommand(
 			this.options.sampleIntervalMs,
@@ -208,6 +210,14 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		const normalizedY = (payload.y - bounds.y) / height;
 		const withinBounds =
 			normalizedX >= 0 && normalizedX <= 1 && normalizedY >= 0 && normalizedY <= 1;
+		const leftButtonDown = payload.leftButtonDown === true;
+		const interactionType =
+			leftButtonDown && !this.previousLeftButtonDown
+				? "click"
+				: !leftButtonDown && this.previousLeftButtonDown
+					? "mouseup"
+					: "move";
+		this.previousLeftButtonDown = leftButtonDown;
 
 		if (this.sampleCount === 0 || (!withinBounds && this.outOfBoundsSampleCount === 0)) {
 			this.logDiagnostic("sample", {
@@ -231,6 +241,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 				assetId: payload.handle,
 				visible: payload.visible && withinBounds,
 				cursorType: payload.cursorType ?? payload.asset?.cursorType ?? null,
+				interactionType,
 			},
 		};
 	}
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
index 5afc012e7..ce9185a05 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -9,6 +9,7 @@ export interface WindowsCursorSampleEvent {
 	visible: boolean;
 	handle: string | null;
 	cursorType?: NativeCursorType | null;
+	leftButtonDown?: boolean;
 	bounds?: {
 		x: number;
 		y: number;
diff --git a/scripts/test-windows-native-cursor.mjs b/scripts/test-windows-native-cursor.mjs
index 7d7ea45b3..bb08182a2 100644
--- a/scripts/test-windows-native-cursor.mjs
+++ b/scripts/test-windows-native-cursor.mjs
@@ -138,6 +138,9 @@ public static class OpenScreenCursorDiagnosticInterop {
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetCursorInfo(ref CURSORINFO pci);
 
+    [DllImport("user32.dll")]
+    public static extern short GetAsyncKeyState(int vKey);
+
     [DllImport("user32.dll", SetLastError = true)]
     public static extern IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
 
@@ -322,6 +325,7 @@ while ($true) {
     $visible = ($cursorInfo.flags -band 1) -ne 0
     $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
     $cursorType = Get-StandardCursorType $cursorInfo.hCursor
+    $leftButtonDown = ([OpenScreenCursorDiagnosticInterop]::GetAsyncKeyState(0x01) -band 0x8000) -ne 0
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
@@ -342,6 +346,7 @@ while ($true) {
         visible = $visible
         handle = $cursorId
         cursorType = $cursorType
+        leftButtonDown = $leftButtonDown
         bounds = @{
             x = $screenBounds.Left
             y = $screenBounds.Top
@@ -366,11 +371,15 @@ Add-Type -AssemblyName System.Windows.Forms
 
 $source = @"
 using System.Runtime.InteropServices;
+using System;
 
 public static class OpenScreenMouseDiagnosticInterop {
     [DllImport("user32.dll")]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool SetCursorPos(int X, int Y);
+
+    [DllImport("user32.dll")]
+    public static extern void mouse_event(uint dwFlags, uint dx, uint dy, uint dwData, UIntPtr dwExtraInfo);
 }
 "@
 
@@ -386,8 +395,14 @@ for ($i = 0; $i -lt ${steps}; $i++) {
     $points += @{ x = $x; y = $y }
 }
 
-foreach ($point in $points) {
+for ($i = 0; $i -lt $points.Count; $i++) {
+    $point = $points[$i]
     [OpenScreenMouseDiagnosticInterop]::SetCursorPos($point.x, $point.y) | Out-Null
+    if ($i -eq [int]([Math]::Floor($points.Count / 2))) {
+        [OpenScreenMouseDiagnosticInterop]::mouse_event(0x0002, 0, 0, 0, [UIntPtr]::Zero)
+        Start-Sleep -Milliseconds 90
+        [OpenScreenMouseDiagnosticInterop]::mouse_event(0x0004, 0, 0, 0, [UIntPtr]::Zero)
+    }
     Start-Sleep -Milliseconds ${stepMs}
 }
 `;
@@ -489,12 +504,22 @@ function writeAssets(assets, outputDir) {
 
 function toRecordingData(samples, assets) {
 	const firstTimestampMs = samples[0]?.timestampMs ?? Date.now();
+	let previousLeftButtonDown = false;
 	const normalizedSamples = samples.flatMap((sample) => {
 		const bounds = sample.bounds;
 		if (!bounds || bounds.width <= 0 || bounds.height <= 0) {
 			return [];
 		}
 
+		const leftButtonDown = sample.leftButtonDown === true;
+		const interactionType =
+			leftButtonDown && !previousLeftButtonDown
+				? "click"
+				: !leftButtonDown && previousLeftButtonDown
+					? "mouseup"
+					: "move";
+		previousLeftButtonDown = leftButtonDown;
+
 		return [
 			{
 				timeMs: Math.max(0, sample.timestampMs - firstTimestampMs),
@@ -503,6 +528,7 @@ function toRecordingData(samples, assets) {
 				assetId: sample.handle,
 				visible: Boolean(sample.visible),
 				cursorType: sample.cursorType ?? null,
+				interactionType,
 			},
 		];
 	});
@@ -1045,6 +1071,9 @@ function assertReport(report) {
 	if (report.errorCount > 0) {
 		failures.push(`Sampler reported ${report.errorCount} error event(s).`);
 	}
+	if (report.leftButtonDownSampleCount === 0 || report.clickSampleCount === 0) {
+		failures.push("Left button click interaction was not observed.");
+	}
 
 	if (failures.length > 0) {
 		throw new Error(failures.join(" "));
@@ -1111,6 +1140,15 @@ const samples = events.filter((event) => event.type === "sample");
 const errors = events.filter((event) => event.type === "error");
 const recordingStartTimestampMs = samples[0]?.timestampMs ?? Date.now();
 const uniquePositions = new Set(samples.map((sample) => `${sample.x},${sample.y}`));
+let previousLeftButtonDown = false;
+let clickSampleCount = 0;
+for (const sample of samples) {
+	const leftButtonDown = sample.leftButtonDown === true;
+	if (leftButtonDown && !previousLeftButtonDown) {
+		clickSampleCount += 1;
+	}
+	previousLeftButtonDown = leftButtonDown;
+}
 const report = {
 	outputDir: OUTPUT_DIR,
 	sampleIntervalMs: SAMPLE_INTERVAL_MS,
@@ -1121,6 +1159,8 @@ const report = {
 	assetCount: assets.size,
 	uniqueCursorHandleCount: new Set(samples.map((sample) => sample.handle).filter(Boolean)).size,
 	uniquePositionCount: uniquePositions.size,
+	leftButtonDownSampleCount: samples.filter((sample) => sample.leftButtonDown === true).length,
+	clickSampleCount,
 	errorCount: errors.length,
 	firstSample: samples[0] ?? null,
 	lastSample: samples.at(-1) ?? null,
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index d1a1ec15c..c0318e2f5 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -1438,6 +1438,9 @@ export default function VideoEditor() {
 						cropRegion,
 						cursorRecordingData,
 						cursorScale: showCursor ? cursorSize : 0,
+						cursorSmoothing,
+						cursorMotionBlur,
+						cursorClickBounce,
 						annotationRegions,
 						webcamLayoutPreset,
 						webcamMaskShape,
@@ -1582,6 +1585,9 @@ export default function VideoEditor() {
 						cropRegion,
 						cursorRecordingData,
 						cursorScale: showCursor ? cursorSize : 0,
+						cursorSmoothing,
+						cursorMotionBlur,
+						cursorClickBounce,
 						annotationRegions,
 						webcamLayoutPreset,
 						webcamMaskShape,
@@ -1680,6 +1686,9 @@ export default function VideoEditor() {
 			effectiveCursorHighlight,
 			showCursor,
 			cursorSize,
+			cursorSmoothing,
+			cursorMotionBlur,
+			cursorClickBounce,
 			t,
 		],
 	);
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index 0cf0187fb..3c0f9787c 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -26,11 +26,19 @@ import {
 	type WebcamSizePreset,
 } from "@/lib/compositeLayout";
 import {
+	createNativeCursorMotionBlurState,
+	createNativeCursorSmoothingState,
+	getNativeCursorClickBounceProgress,
+	getNativeCursorClickBounceScale,
+	getNativeCursorMotionBlurPx,
 	hasNativeCursorRecordingData,
 	projectNativeCursorToLocal,
 	projectNativeCursorToStage,
+	resetNativeCursorMotionBlurState,
+	resetNativeCursorSmoothingState,
 	resolveInterpolatedNativeCursorFrame,
 	resolveNativeCursorRenderAsset,
+	smoothNativeCursorSample,
 } from "@/lib/cursor/nativeCursor";
 import { classifyWallpaper, DEFAULT_WALLPAPER, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { getCssClipPath } from "@/lib/webcamMaskShapes";
@@ -319,6 +327,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 		const nativeCursorTextureIdRef = useRef<string | null>(null);
 		const nativeCursorImageRef = useRef<HTMLImageElement | null>(null);
 		const nativeCursorImageIdRef = useRef<string | null>(null);
+		const nativeCursorSmoothingStateRef = useRef(createNativeCursorSmoothingState());
+		const nativeCursorMotionBlurStateRef = useRef(createNativeCursorMotionBlurState());
 
 		const hasNativeCursorRecording = useMemo(
 			() => hasNativeCursorRecordingData(cursorRecordingData),
@@ -757,6 +767,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 
 		useEffect(() => {
 			cursorRecordingDataRef.current = cursorRecordingData;
+			resetNativeCursorSmoothingState(nativeCursorSmoothingStateRef.current);
+			resetNativeCursorMotionBlurState(nativeCursorMotionBlurStateRef.current);
 		}, [cursorRecordingData]);
 
 		useEffect(() => {
@@ -1426,7 +1438,10 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 					}
 					if (nativeCursorImage) {
 						nativeCursorImage.style.display = "none";
+						nativeCursorImage.style.filter = "none";
 					}
+					resetNativeCursorSmoothingState(nativeCursorSmoothingStateRef.current);
+					resetNativeCursorMotionBlurState(nativeCursorMotionBlurStateRef.current);
 				};
 				if (nativeCursorImage) {
 					if (hasNativeCursorRecordingRef.current && showCursorRef.current) {
@@ -1436,13 +1451,20 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 							timeMs,
 						);
 						if (frame) {
+							const displaySample = smoothNativeCursorSample({
+								forceSnap: !isPlayingRef.current || isSeekingRef.current,
+								sample: frame.sample,
+								smoothing: cursorSmoothingRef.current,
+								state: nativeCursorSmoothingStateRef.current,
+								timeMs,
+							});
 							const cameraContainer = cameraContainerRef.current;
 							const videoContainer = videoContainerRef.current;
 							const cropRegionValue = cropRegionRef.current ?? { x: 0, y: 0, width: 1, height: 1 };
 							const projectedLocalPoint = projectNativeCursorToLocal({
 								cropRegion: cropRegionValue,
 								maskRect: baseMaskRef.current,
-								sample: frame.sample,
+								sample: displaySample,
 							});
 							const projectedStagePoint =
 								cameraContainer && videoContainer
@@ -1454,17 +1476,32 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 												x: videoContainer.x,
 												y: videoContainer.y,
 											},
-											sample: frame.sample,
+											sample: displaySample,
 										})
 									: null;
 							if (projectedLocalPoint && projectedStagePoint) {
 								const renderAsset = resolveNativeCursorRenderAsset(
 									frame.asset,
 									window.devicePixelRatio || 1,
-									frame.sample,
+									displaySample,
+								);
+								const bounceProgress = getNativeCursorClickBounceProgress(
+									cursorRecordingDataRef.current,
+									timeMs,
 								);
-								const scale = Math.max(0, cursorSizeRef.current);
+								const scale =
+									Math.max(0, cursorSizeRef.current) *
+									getNativeCursorClickBounceScale(cursorClickBounceRef.current, bounceProgress);
 								const transformedScale = scale * Math.abs(cameraContainer?.scale.x || 1);
+								const blurPx =
+									!isPlayingRef.current || isSeekingRef.current
+										? 0
+										: getNativeCursorMotionBlurPx({
+												motionBlur: cursorMotionBlurRef.current,
+												point: projectedStagePoint,
+												state: nativeCursorMotionBlurStateRef.current,
+												timeMs,
+											});
 								if (nativeCursorImageIdRef.current !== renderAsset.id) {
 									nativeCursorImage.src = renderAsset.imageDataUrl;
 									nativeCursorImageIdRef.current = renderAsset.id;
@@ -1472,6 +1509,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 								nativeCursorImage.style.display = "block";
 								nativeCursorImage.style.width = `${renderAsset.width * transformedScale}px`;
 								nativeCursorImage.style.height = `${renderAsset.height * transformedScale}px`;
+								nativeCursorImage.style.filter =
+									blurPx > 0 ? `blur(${blurPx.toFixed(2)}px)` : "none";
 								nativeCursorImage.style.transform = `translate3d(${
 									projectedStagePoint.x - renderAsset.hotspotX * transformedScale
 								}px, ${projectedStagePoint.y - renderAsset.hotspotY * transformedScale}px, 0)`;
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 6f82e0ba6..0291b15ec 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -28,6 +28,20 @@ export interface ActiveNativeCursorFrame {
 	sample: CursorRecordingSample;
 }
 
+export interface NativeCursorSmoothingState {
+	cx: number;
+	cy: number;
+	lastTimeMs: number | null;
+	initialized: boolean;
+}
+
+export interface NativeCursorMotionBlurState {
+	x: number;
+	y: number;
+	lastTimeMs: number | null;
+	initialized: boolean;
+}
+
 interface ProjectNativeCursorOptions {
 	cropRegion: CropRegion;
 	maskRect: { x: number; y: number; width: number; height: number };
@@ -43,6 +57,9 @@ function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
+const NATIVE_CURSOR_CLICK_ANIMATION_MS = 140;
+const NATIVE_CURSOR_MOTION_BLUR_MAX_PX = 6;
+
 interface PrettyNativeCursorAsset {
 	imageDataUrl: string;
 	width: number;
@@ -167,17 +184,20 @@ const PRETTY_NATIVE_CURSOR_ASSETS: Partial<Record<NativeCursorType, PrettyNative
 };
 
 function resolveUntypedPrettyNativeCursorAsset(asset: NativeCursorAsset) {
-	if (asset.cursorType || asset.width < 24 || asset.width > 64 || asset.height < 24 || asset.height > 64) {
+	if (
+		asset.cursorType ||
+		asset.width < 24 ||
+		asset.width > 64 ||
+		asset.height < 24 ||
+		asset.height > 64
+	) {
 		return null;
 	}
 
 	const hotspotXNorm = asset.hotspotX / asset.width;
 	const hotspotYNorm = asset.hotspotY / asset.height;
 	const looksLikeChromiumGrabCursor =
-		hotspotXNorm >= 0.22 &&
-		hotspotXNorm <= 0.55 &&
-		hotspotYNorm >= 0.2 &&
-		hotspotYNorm <= 0.45;
+		hotspotXNorm >= 0.22 && hotspotXNorm <= 0.55 && hotspotYNorm >= 0.2 && hotspotYNorm <= 0.45;
 
 	return looksLikeChromiumGrabCursor ? (PRETTY_NATIVE_CURSOR_ASSETS["open-hand"] ?? null) : null;
 }
@@ -193,6 +213,155 @@ export function hasNativeCursorRecordingData(
 	);
 }
 
+export function createNativeCursorSmoothingState(): NativeCursorSmoothingState {
+	return {
+		cx: 0,
+		cy: 0,
+		lastTimeMs: null,
+		initialized: false,
+	};
+}
+
+export function resetNativeCursorSmoothingState(state: NativeCursorSmoothingState) {
+	state.cx = 0;
+	state.cy = 0;
+	state.lastTimeMs = null;
+	state.initialized = false;
+}
+
+export function createNativeCursorMotionBlurState(): NativeCursorMotionBlurState {
+	return {
+		x: 0,
+		y: 0,
+		lastTimeMs: null,
+		initialized: false,
+	};
+}
+
+export function resetNativeCursorMotionBlurState(state: NativeCursorMotionBlurState) {
+	state.x = 0;
+	state.y = 0;
+	state.lastTimeMs = null;
+	state.initialized = false;
+}
+
+export function smoothNativeCursorSample({
+	forceSnap = false,
+	sample,
+	smoothing,
+	state,
+	timeMs,
+}: {
+	forceSnap?: boolean;
+	sample: CursorRecordingSample;
+	smoothing: number;
+	state: NativeCursorSmoothingState;
+	timeMs: number;
+}): CursorRecordingSample {
+	const clampedSmoothing = clamp(Number.isFinite(smoothing) ? smoothing : 0, 0, 0.98);
+	const previousTimeMs = state.lastTimeMs;
+	const shouldSnap =
+		forceSnap ||
+		clampedSmoothing <= 0 ||
+		!state.initialized ||
+		previousTimeMs === null ||
+		timeMs <= previousTimeMs;
+
+	if (shouldSnap) {
+		state.cx = sample.cx;
+		state.cy = sample.cy;
+		state.lastTimeMs = timeMs;
+		state.initialized = true;
+		return sample;
+	}
+
+	const frameCount = Math.max(1, (timeMs - previousTimeMs) / (1000 / 60));
+	const alpha = 1 - Math.pow(clampedSmoothing, frameCount);
+	state.cx += (sample.cx - state.cx) * alpha;
+	state.cy += (sample.cy - state.cy) * alpha;
+	state.lastTimeMs = timeMs;
+
+	return {
+		...sample,
+		cx: state.cx,
+		cy: state.cy,
+	};
+}
+
+export function getNativeCursorClickBounceProgress(
+	recordingData: CursorRecordingData | null | undefined,
+	timeMs: number,
+) {
+	if (!hasNativeCursorRecordingData(recordingData)) {
+		return 0;
+	}
+
+	for (let index = recordingData.samples.length - 1; index >= 0; index -= 1) {
+		const sample = recordingData.samples[index];
+		if (sample.timeMs > timeMs) {
+			continue;
+		}
+
+		const ageMs = timeMs - sample.timeMs;
+		if (ageMs > NATIVE_CURSOR_CLICK_ANIMATION_MS) {
+			return 0;
+		}
+
+		if (sample.interactionType === "click") {
+			return 1 - ageMs / NATIVE_CURSOR_CLICK_ANIMATION_MS;
+		}
+	}
+
+	return 0;
+}
+
+export function getNativeCursorClickBounceScale(clickBounce: number, progress: number) {
+	if (progress <= 0 || clickBounce <= 0) {
+		return 1;
+	}
+
+	const bounceAmount = Math.sin(progress * Math.PI);
+	const amplitude = clamp(clickBounce, 0, 4) * 0.08;
+	return Math.max(0.72, 1 - bounceAmount * amplitude);
+}
+
+export function getNativeCursorMotionBlurPx({
+	motionBlur,
+	point,
+	state,
+	timeMs,
+}: {
+	motionBlur: number;
+	point: { x: number; y: number };
+	state: NativeCursorMotionBlurState;
+	timeMs: number;
+}) {
+	const clampedMotionBlur = clamp(Number.isFinite(motionBlur) ? motionBlur : 0, 0, 1);
+	const previousTimeMs = state.lastTimeMs;
+	const shouldSnap =
+		clampedMotionBlur <= 0 ||
+		!state.initialized ||
+		previousTimeMs === null ||
+		timeMs <= previousTimeMs;
+
+	if (shouldSnap) {
+		state.x = point.x;
+		state.y = point.y;
+		state.lastTimeMs = timeMs;
+		state.initialized = true;
+		return 0;
+	}
+
+	const deltaMs = Math.max(1, timeMs - previousTimeMs);
+	const distance = Math.hypot(point.x - state.x, point.y - state.y);
+	const speedPxPerSecond = (distance / deltaMs) * 1000;
+	state.x = point.x;
+	state.y = point.y;
+	state.lastTimeMs = timeMs;
+
+	return clamp(speedPxPerSecond * clampedMotionBlur * 0.004, 0, NATIVE_CURSOR_MOTION_BLUR_MAX_PX);
+}
+
 function getCroppedCursorPosition(sample: CursorRecordingSample, cropRegion: CropRegion) {
 	if (cropRegion.width <= 0 || cropRegion.height <= 0) {
 		return null;
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index 456980c04..f2a30681a 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -58,9 +58,17 @@ import {
 	type StyledRenderRect,
 } from "@/lib/compositeLayout";
 import {
+	createNativeCursorMotionBlurState,
+	createNativeCursorSmoothingState,
+	getNativeCursorClickBounceProgress,
+	getNativeCursorClickBounceScale,
+	getNativeCursorMotionBlurPx,
 	projectNativeCursorToLocal,
+	resetNativeCursorMotionBlurState,
+	resetNativeCursorSmoothingState,
 	resolveInterpolatedNativeCursorFrame,
 	resolveNativeCursorRenderAsset,
+	smoothNativeCursorSample,
 } from "@/lib/cursor/nativeCursor";
 import { BackgroundLoadError, classifyWallpaper, resolveImageWallpaperUrl } from "@/lib/wallpaper";
 import { drawCanvasClipPath } from "@/lib/webcamMaskShapes";
@@ -88,6 +96,9 @@ interface FrameRenderConfig {
 	cropRegion: CropRegion;
 	cursorRecordingData?: CursorRecordingData | null;
 	cursorScale?: number;
+	cursorSmoothing?: number;
+	cursorMotionBlur?: number;
+	cursorClickBounce?: number;
 	videoWidth: number;
 	videoHeight: number;
 	webcamSize?: Size | null;
@@ -152,6 +163,8 @@ export class FrameRenderer {
 	private layoutCache: LayoutCache | null = null;
 	private currentVideoTime = 0;
 	private motionBlurState: MotionBlurState = createMotionBlurState();
+	private nativeCursorSmoothingState = createNativeCursorSmoothingState();
+	private nativeCursorMotionBlurState = createNativeCursorMotionBlurState();
 	private smoothedAutoFocus: { cx: number; cy: number } | null = null;
 	private prevAnimationTimeMs: number | null = null;
 	private prevTargetProgress = 0;
@@ -562,6 +575,8 @@ export class FrameRenderer {
 		}
 
 		if ((this.config.cursorScale ?? 1) <= 0) {
+			resetNativeCursorSmoothingState(this.nativeCursorSmoothingState);
+			resetNativeCursorMotionBlurState(this.nativeCursorMotionBlurState);
 			return;
 		}
 
@@ -570,23 +585,28 @@ export class FrameRenderer {
 			timeMs,
 		);
 		if (!activeNativeCursor) {
+			resetNativeCursorSmoothingState(this.nativeCursorSmoothingState);
+			resetNativeCursorMotionBlurState(this.nativeCursorMotionBlurState);
 			return;
 		}
+		const displaySample = smoothNativeCursorSample({
+			sample: activeNativeCursor.sample,
+			smoothing: this.config.cursorSmoothing ?? 0,
+			state: this.nativeCursorSmoothingState,
+			timeMs,
+		});
 
 		const projectedPoint = projectNativeCursorToLocal({
 			cropRegion: this.config.cropRegion,
 			maskRect: this.layoutCache.maskRect,
-			sample: activeNativeCursor.sample,
+			sample: displaySample,
 		});
 		if (!projectedPoint) {
+			resetNativeCursorMotionBlurState(this.nativeCursorMotionBlurState);
 			return;
 		}
 
-		const renderAsset = resolveNativeCursorRenderAsset(
-			activeNativeCursor.asset,
-			1,
-			activeNativeCursor.sample,
-		);
+		const renderAsset = resolveNativeCursorRenderAsset(activeNativeCursor.asset, 1, displaySample);
 		let image: HTMLImageElement;
 		try {
 			image = await this.getCursorImage(renderAsset);
@@ -594,10 +614,25 @@ export class FrameRenderer {
 			this.warnOnce("native-cursor-image-load", "Failed to load native cursor asset", error);
 			return;
 		}
-		const scale = Math.max(0, this.config.cursorScale ?? 1);
+		const scale =
+			Math.max(0, this.config.cursorScale ?? 1) *
+			getNativeCursorClickBounceScale(
+				this.config.cursorClickBounce ?? 0,
+				getNativeCursorClickBounceProgress(this.config.cursorRecordingData, timeMs),
+			);
 		const appliedScale = this.animationState.appliedScale;
 		const canvasX = projectedPoint.x * appliedScale + this.animationState.x;
 		const canvasY = projectedPoint.y * appliedScale + this.animationState.y;
+		const blurPx = getNativeCursorMotionBlurPx({
+			motionBlur: this.config.cursorMotionBlur ?? 0,
+			point: { x: canvasX, y: canvasY },
+			state: this.nativeCursorMotionBlurState,
+			timeMs,
+		});
+		const previousFilter = this.foregroundCtx.filter;
+		if (blurPx > 0) {
+			this.foregroundCtx.filter = `blur(${blurPx.toFixed(2)}px)`;
+		}
 		this.foregroundCtx.drawImage(
 			image,
 			canvasX - renderAsset.hotspotX * scale * appliedScale,
@@ -605,6 +640,7 @@ export class FrameRenderer {
 			renderAsset.width * scale * appliedScale,
 			renderAsset.height * scale * appliedScale,
 		);
+		this.foregroundCtx.filter = previousFilter;
 	}
 
 	private async getCursorImage(asset: { id: string; imageDataUrl: string }) {
diff --git a/src/lib/exporter/gifExporter.ts b/src/lib/exporter/gifExporter.ts
index c1120afda..6ff3f8793 100644
--- a/src/lib/exporter/gifExporter.ts
+++ b/src/lib/exporter/gifExporter.ts
@@ -9,9 +9,9 @@ import type {
 	ZoomRegion,
 } from "@/components/video-editor/types";
 import { BackgroundLoadError } from "@/lib/wallpaper";
+import type { CursorRecordingData } from "@/native/contracts";
 import { getPlatform } from "@/utils/platformUtils";
 import { AsyncVideoFrameQueue } from "./asyncVideoFrameQueue";
-import type { CursorRecordingData } from "@/native/contracts";
 import { FrameRenderer } from "./frameRenderer";
 import { StreamingVideoDecoder } from "./streamingDecoder";
 import type {
@@ -50,6 +50,9 @@ interface GifExporterConfig {
 	webcamPosition?: { cx: number; cy: number } | null;
 	cursorRecordingData?: CursorRecordingData | null;
 	cursorScale?: number;
+	cursorSmoothing?: number;
+	cursorMotionBlur?: number;
+	cursorClickBounce?: number;
 	annotationRegions?: AnnotationRegion[];
 	previewWidth?: number;
 	previewHeight?: number;
@@ -156,6 +159,9 @@ export class GifExporter {
 				cropRegion: this.config.cropRegion,
 				cursorRecordingData: this.config.cursorRecordingData,
 				cursorScale: this.config.cursorScale,
+				cursorSmoothing: this.config.cursorSmoothing,
+				cursorMotionBlur: this.config.cursorMotionBlur,
+				cursorClickBounce: this.config.cursorClickBounce,
 				videoWidth: videoInfo.width,
 				videoHeight: videoInfo.height,
 				webcamSize: webcamInfo ? { width: webcamInfo.width, height: webcamInfo.height } : null,
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index fb386118c..19cd5a0ee 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -8,9 +8,9 @@ import type {
 	ZoomRegion,
 } from "@/components/video-editor/types";
 import { BackgroundLoadError } from "@/lib/wallpaper";
+import type { CursorRecordingData } from "@/native/contracts";
 import { getPlatform } from "@/utils/platformUtils";
 import { AsyncVideoFrameQueue } from "./asyncVideoFrameQueue";
-import type { CursorRecordingData } from "@/native/contracts";
 import { AudioProcessor } from "./audioEncoder";
 import { FrameRenderer } from "./frameRenderer";
 import { VideoMuxer } from "./muxer";
@@ -41,6 +41,9 @@ interface VideoExporterConfig extends ExportConfig {
 	webcamPosition?: { cx: number; cy: number } | null;
 	cursorRecordingData?: CursorRecordingData | null;
 	cursorScale?: number;
+	cursorSmoothing?: number;
+	cursorMotionBlur?: number;
+	cursorClickBounce?: number;
 	annotationRegions?: AnnotationRegion[];
 	previewWidth?: number;
 	previewHeight?: number;
@@ -151,6 +154,9 @@ export class VideoExporter {
 				cropRegion: this.config.cropRegion,
 				cursorRecordingData: this.config.cursorRecordingData,
 				cursorScale: this.config.cursorScale,
+				cursorSmoothing: this.config.cursorSmoothing,
+				cursorMotionBlur: this.config.cursorMotionBlur,
+				cursorClickBounce: this.config.cursorClickBounce,
 				videoWidth: videoInfo.width,
 				videoHeight: videoInfo.height,
 				webcamSize: webcamInfo ? { width: webcamInfo.width, height: webcamInfo.height } : null,
diff --git a/src/native/contracts.ts b/src/native/contracts.ts
index ef45336d0..6836095ac 100644
--- a/src/native/contracts.ts
+++ b/src/native/contracts.ts
@@ -31,6 +31,7 @@ export interface CursorRecordingSample extends CursorTelemetryPoint {
 	assetId?: string | null;
 	visible?: boolean;
 	cursorType?: NativeCursorType | null;
+	interactionType?: "move" | "click" | "mouseup";
 }
 
 export interface NativeCursorAsset {

From 0f26eac71433a3bee0cff8391965a6b2e7e9ac4e Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 21:33:40 +0200
Subject: [PATCH 24/38] fix: capture quick native cursor clicks

---
 .../windowsNativeRecordingSession.script.ts    |  6 +++++-
 .../recording/windowsNativeRecordingSession.ts |  3 ++-
 .../windowsNativeRecordingSession.types.ts     |  1 +
 scripts/test-windows-native-cursor.mjs         | 18 +++++++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index e1484a854..e19281993 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -263,6 +263,7 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
     }
 }
 
+[OpenScreenCursorInterop]::GetAsyncKeyState(0x01) | Out-Null
 Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
 
 $lastCursorId = $null
@@ -279,7 +280,9 @@ while ($true) {
     $visible = ($cursorInfo.flags -band 1) -ne 0
     $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
     $cursorType = Get-StandardCursorType $cursorInfo.hCursor
-    $leftButtonDown = ([OpenScreenCursorInterop]::GetAsyncKeyState(0x01) -band 0x8000) -ne 0
+    $leftButtonState = [OpenScreenCursorInterop]::GetAsyncKeyState(0x01)
+    $leftButtonDown = ($leftButtonState -band 0x8000) -ne 0
+    $leftButtonPressed = ($leftButtonState -band 0x0001) -ne 0
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
@@ -301,6 +304,7 @@ while ($true) {
         handle = $cursorId
         cursorType = $cursorType
         leftButtonDown = $leftButtonDown
+        leftButtonPressed = $leftButtonPressed
 		bounds = Get-TargetBounds
         asset = $asset
     }
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index 1b6355a39..a037cc40d 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -211,8 +211,9 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		const withinBounds =
 			normalizedX >= 0 && normalizedX <= 1 && normalizedY >= 0 && normalizedY <= 1;
 		const leftButtonDown = payload.leftButtonDown === true;
+		const leftButtonPressed = payload.leftButtonPressed === true;
 		const interactionType =
-			leftButtonDown && !this.previousLeftButtonDown
+			leftButtonPressed || (leftButtonDown && !this.previousLeftButtonDown)
 				? "click"
 				: !leftButtonDown && this.previousLeftButtonDown
 					? "mouseup"
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
index ce9185a05..2ee43c4fa 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -10,6 +10,7 @@ export interface WindowsCursorSampleEvent {
 	handle: string | null;
 	cursorType?: NativeCursorType | null;
 	leftButtonDown?: boolean;
+	leftButtonPressed?: boolean;
 	bounds?: {
 		x: number;
 		y: number;
diff --git a/scripts/test-windows-native-cursor.mjs b/scripts/test-windows-native-cursor.mjs
index bb08182a2..ba991623d 100644
--- a/scripts/test-windows-native-cursor.mjs
+++ b/scripts/test-windows-native-cursor.mjs
@@ -308,6 +308,7 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
     }
 }
 
+[OpenScreenCursorDiagnosticInterop]::GetAsyncKeyState(0x01) | Out-Null
 Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
 
 $lastCursorId = $null
@@ -325,7 +326,9 @@ while ($true) {
     $visible = ($cursorInfo.flags -band 1) -ne 0
     $cursorId = if ($cursorInfo.hCursor -eq [IntPtr]::Zero) { $null } else { ('0x{0:X}' -f $cursorInfo.hCursor.ToInt64()) }
     $cursorType = Get-StandardCursorType $cursorInfo.hCursor
-    $leftButtonDown = ([OpenScreenCursorDiagnosticInterop]::GetAsyncKeyState(0x01) -band 0x8000) -ne 0
+    $leftButtonState = [OpenScreenCursorDiagnosticInterop]::GetAsyncKeyState(0x01)
+    $leftButtonDown = ($leftButtonState -band 0x8000) -ne 0
+    $leftButtonPressed = ($leftButtonState -band 0x0001) -ne 0
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
@@ -347,6 +350,7 @@ while ($true) {
         handle = $cursorId
         cursorType = $cursorType
         leftButtonDown = $leftButtonDown
+        leftButtonPressed = $leftButtonPressed
         bounds = @{
             x = $screenBounds.Left
             y = $screenBounds.Top
@@ -400,7 +404,7 @@ for ($i = 0; $i -lt $points.Count; $i++) {
     [OpenScreenMouseDiagnosticInterop]::SetCursorPos($point.x, $point.y) | Out-Null
     if ($i -eq [int]([Math]::Floor($points.Count / 2))) {
         [OpenScreenMouseDiagnosticInterop]::mouse_event(0x0002, 0, 0, 0, [UIntPtr]::Zero)
-        Start-Sleep -Milliseconds 90
+        Start-Sleep -Milliseconds 12
         [OpenScreenMouseDiagnosticInterop]::mouse_event(0x0004, 0, 0, 0, [UIntPtr]::Zero)
     }
     Start-Sleep -Milliseconds ${stepMs}
@@ -512,8 +516,9 @@ function toRecordingData(samples, assets) {
 		}
 
 		const leftButtonDown = sample.leftButtonDown === true;
+		const leftButtonPressed = sample.leftButtonPressed === true;
 		const interactionType =
-			leftButtonDown && !previousLeftButtonDown
+			leftButtonPressed || (leftButtonDown && !previousLeftButtonDown)
 				? "click"
 				: !leftButtonDown && previousLeftButtonDown
 					? "mouseup"
@@ -1071,7 +1076,7 @@ function assertReport(report) {
 	if (report.errorCount > 0) {
 		failures.push(`Sampler reported ${report.errorCount} error event(s).`);
 	}
-	if (report.leftButtonDownSampleCount === 0 || report.clickSampleCount === 0) {
+	if (report.leftButtonPressedSampleCount === 0 || report.clickSampleCount === 0) {
 		failures.push("Left button click interaction was not observed.");
 	}
 
@@ -1144,7 +1149,8 @@ let previousLeftButtonDown = false;
 let clickSampleCount = 0;
 for (const sample of samples) {
 	const leftButtonDown = sample.leftButtonDown === true;
-	if (leftButtonDown && !previousLeftButtonDown) {
+	const leftButtonPressed = sample.leftButtonPressed === true;
+	if (leftButtonPressed || (leftButtonDown && !previousLeftButtonDown)) {
 		clickSampleCount += 1;
 	}
 	previousLeftButtonDown = leftButtonDown;
@@ -1160,6 +1166,8 @@ const report = {
 	uniqueCursorHandleCount: new Set(samples.map((sample) => sample.handle).filter(Boolean)).size,
 	uniquePositionCount: uniquePositions.size,
 	leftButtonDownSampleCount: samples.filter((sample) => sample.leftButtonDown === true).length,
+	leftButtonPressedSampleCount: samples.filter((sample) => sample.leftButtonPressed === true)
+		.length,
 	clickSampleCount,
 	errorCount: errors.length,
 	firstSample: samples[0] ?? null,

From f661a39cf8b1c53b785924632399b4d51aa53a28 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 21:49:40 +0200
Subject: [PATCH 25/38] fix: record native cursor click events

---
 .../windowsNativeRecordingSession.script.ts   |  80 +++++++++++++-
 .../windowsNativeRecordingSession.ts          |  45 +++++++-
 .../windowsNativeRecordingSession.types.ts    |   1 +
 scripts/test-windows-native-cursor.mjs        | 102 +++++++++++++++---
 4 files changed, 208 insertions(+), 20 deletions(-)

diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
index e19281993..bed037a1e 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.script.ts
@@ -1,4 +1,4 @@
-export function buildPowerShellCommand(sampleIntervalMs: number, windowHandle?: string | null) {
+export function buildPowerShellScript(sampleIntervalMs: number, windowHandle?: string | null) {
 	const targetWindowHandle =
 		typeof windowHandle === "string" && /^(?:0x[0-9a-fA-F]+|\d+)$/.test(windowHandle)
 			? `'${windowHandle}'`
@@ -6,14 +6,32 @@ export function buildPowerShellCommand(sampleIntervalMs: number, windowHandle?:
 	const script = String.raw`
 $ErrorActionPreference = 'Stop'
 Add-Type -AssemblyName System.Drawing
+Add-Type -AssemblyName System.Windows.Forms
 
 $targetWindowHandle = ${targetWindowHandle}
 
 $source = @"
 using System;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 public static class OpenScreenCursorInterop {
+    private const int WH_MOUSE_LL = 14;
+    private const int WM_LBUTTONDOWN = 0x0201;
+    private const int WM_LBUTTONUP = 0x0202;
+    private static readonly object MouseSync = new object();
+    private static int LeftDownCount = 0;
+    private static int LeftUpCount = 0;
+    private static IntPtr MouseHook = IntPtr.Zero;
+    private static LowLevelMouseProc MouseProcDelegate = MouseHookCallback;
+
+    public delegate IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam);
+
+    public struct MouseButtonEvents {
+        public int LeftDownCount;
+        public int LeftUpCount;
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     public struct POINT {
         public int X;
@@ -46,6 +64,48 @@ public static class OpenScreenCursorInterop {
 		public int Bottom;
 	}
 
+    public static bool InstallMouseHook() {
+        if (MouseHook != IntPtr.Zero) {
+            return true;
+        }
+
+        using (Process process = Process.GetCurrentProcess())
+        using (ProcessModule module = process.MainModule) {
+            MouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseProcDelegate, GetModuleHandle(module.ModuleName), 0);
+        }
+
+        return MouseHook != IntPtr.Zero;
+    }
+
+    public static MouseButtonEvents ConsumeMouseButtonEvents() {
+        lock (MouseSync) {
+            MouseButtonEvents events = new MouseButtonEvents {
+                LeftDownCount = LeftDownCount,
+                LeftUpCount = LeftUpCount
+            };
+            LeftDownCount = 0;
+            LeftUpCount = 0;
+            return events;
+        }
+    }
+
+    private static IntPtr MouseHookCallback(int nCode, IntPtr wParam, IntPtr lParam) {
+        if (nCode >= 0) {
+            int message = wParam.ToInt32();
+            if (message == WM_LBUTTONDOWN || message == WM_LBUTTONUP) {
+                lock (MouseSync) {
+                    if (message == WM_LBUTTONDOWN) {
+                        LeftDownCount += 1;
+                    } else {
+                        LeftUpCount += 1;
+                    }
+                }
+            }
+        }
+
+        return CallNextHookEx(MouseHook, nCode, wParam, lParam);
+    }
+
     [DllImport("user32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetCursorInfo(ref CURSORINFO pci);
@@ -78,6 +138,15 @@ public static class OpenScreenCursorInterop {
     [DllImport("gdi32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool DeleteObject(IntPtr hObject);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern IntPtr SetWindowsHookEx(int idHook, LowLevelMouseProc lpfn, IntPtr hMod, uint dwThreadId);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    private static extern IntPtr GetModuleHandle(string lpModuleName);
 }
 "@
 
@@ -263,11 +332,14 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
     }
 }
 
+[OpenScreenCursorInterop]::InstallMouseHook() | Out-Null
 [OpenScreenCursorInterop]::GetAsyncKeyState(0x01) | Out-Null
 Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
 
 $lastCursorId = $null
 while ($true) {
+    [System.Windows.Forms.Application]::DoEvents()
+    $mouseEvents = [OpenScreenCursorInterop]::ConsumeMouseButtonEvents()
     $cursorInfo = New-Object OpenScreenCursorInterop+CURSORINFO
     $cursorInfo.cbSize = [Runtime.InteropServices.Marshal]::SizeOf([type][OpenScreenCursorInterop+CURSORINFO])
 
@@ -282,7 +354,8 @@ while ($true) {
     $cursorType = Get-StandardCursorType $cursorInfo.hCursor
     $leftButtonState = [OpenScreenCursorInterop]::GetAsyncKeyState(0x01)
     $leftButtonDown = ($leftButtonState -band 0x8000) -ne 0
-    $leftButtonPressed = ($leftButtonState -band 0x0001) -ne 0
+    $leftButtonPressed = ($mouseEvents.LeftDownCount -gt 0) -or (($leftButtonState -band 0x0001) -ne 0)
+    $leftButtonReleased = $mouseEvents.LeftUpCount -gt 0
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
@@ -305,6 +378,7 @@ while ($true) {
         cursorType = $cursorType
         leftButtonDown = $leftButtonDown
         leftButtonPressed = $leftButtonPressed
+        leftButtonReleased = $leftButtonReleased
 		bounds = Get-TargetBounds
         asset = $asset
     }
@@ -313,5 +387,5 @@ while ($true) {
 }
 `;
 
-	return Buffer.from(script, "utf16le").toString("base64");
+	return script;
 }
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index a037cc40d..59acf80ad 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -1,4 +1,8 @@
 import { type ChildProcessByStdio, spawn } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import type { Readable } from "node:stream";
 import { screen } from "electron";
 import { parseWindowHandleFromSourceId } from "../../../../src/lib/nativeWindowsRecording";
@@ -8,7 +12,7 @@ import type {
 	NativeCursorAsset,
 } from "../../../../src/native/contracts";
 import type { CursorRecordingSession } from "./session";
-import { buildPowerShellCommand } from "./windowsNativeRecordingSession.script";
+import { buildPowerShellScript } from "./windowsNativeRecordingSession.script";
 import type {
 	WindowsCursorEvent,
 	WindowsNativeRecordingSessionOptions,
@@ -25,6 +29,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 	private assets = new Map<string, NativeCursorAsset>();
 	private samples: CursorRecordingSample[] = [];
 	private process: ChildProcessByStdio<null, Readable, Readable> | null = null;
+	private helperScriptPath: string | null = null;
 	private lineBuffer = "";
 	private startTimeMs = 0;
 	private readyResolve: (() => void) | null = null;
@@ -45,10 +50,18 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		this.outOfBoundsSampleCount = 0;
 		this.previousLeftButtonDown = false;
 
-		const encodedCommand = buildPowerShellCommand(
+		const script = buildPowerShellScript(
 			this.options.sampleIntervalMs,
 			parseWindowHandleFromSourceId(this.options.sourceId),
 		);
+		const helperScriptDir = join(tmpdir(), "openscreen-cursor-native");
+		mkdirSync(helperScriptDir, { recursive: true });
+		const helperScriptPath = join(
+			helperScriptDir,
+			`cursor-sampler-${process.pid}-${Date.now()}-${randomUUID()}.ps1`,
+		);
+		writeFileSync(helperScriptPath, script, "utf8");
+		this.helperScriptPath = helperScriptPath;
 		const child = spawn(
 			"powershell.exe",
 			[
@@ -57,8 +70,8 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 				"-NonInteractive",
 				"-ExecutionPolicy",
 				"Bypass",
-				"-EncodedCommand",
-				encodedCommand,
+				"-File",
+				helperScriptPath,
 			],
 			{
 				stdio: ["ignore", "pipe", "pipe"],
@@ -87,6 +100,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 			console.error("[cursor-native]", message);
 		});
 		child.once("exit", (code, signal) => {
+			this.cleanupHelperScript(helperScriptPath);
 			this.logDiagnostic("exit", {
 				code,
 				signal,
@@ -99,6 +113,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 			);
 		});
 		child.once("error", (error) => {
+			this.cleanupHelperScript(helperScriptPath);
 			this.logDiagnostic("process-error", { message: error.message });
 			this.rejectReady(error);
 		});
@@ -212,10 +227,11 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 			normalizedX >= 0 && normalizedX <= 1 && normalizedY >= 0 && normalizedY <= 1;
 		const leftButtonDown = payload.leftButtonDown === true;
 		const leftButtonPressed = payload.leftButtonPressed === true;
+		const leftButtonReleased = payload.leftButtonReleased === true;
 		const interactionType =
 			leftButtonPressed || (leftButtonDown && !this.previousLeftButtonDown)
 				? "click"
-				: !leftButtonDown && this.previousLeftButtonDown
+				: leftButtonReleased || (!leftButtonDown && this.previousLeftButtonDown)
 					? "mouseup"
 					: "move";
 		this.previousLeftButtonDown = leftButtonDown;
@@ -287,6 +303,25 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		this.readyReject = null;
 	}
 
+	private cleanupHelperScript(scriptPath = this.helperScriptPath) {
+		if (!scriptPath) {
+			return;
+		}
+
+		try {
+			rmSync(scriptPath, { force: true });
+		} catch (error) {
+			this.logDiagnostic("script-cleanup-error", {
+				path: scriptPath,
+				message: error instanceof Error ? error.message : String(error),
+			});
+		} finally {
+			if (this.helperScriptPath === scriptPath) {
+				this.helperScriptPath = null;
+			}
+		}
+	}
+
 	private logDiagnostic(event: string, data: Record<string, unknown>) {
 		console.info(
 			"[cursor-native][win32]",
diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
index 2ee43c4fa..35a85948a 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -11,6 +11,7 @@ export interface WindowsCursorSampleEvent {
 	cursorType?: NativeCursorType | null;
 	leftButtonDown?: boolean;
 	leftButtonPressed?: boolean;
+	leftButtonReleased?: boolean;
 	bounds?: {
 		x: number;
 		y: number;
diff --git a/scripts/test-windows-native-cursor.mjs b/scripts/test-windows-native-cursor.mjs
index ba991623d..24f568ebf 100644
--- a/scripts/test-windows-native-cursor.mjs
+++ b/scripts/test-windows-native-cursor.mjs
@@ -65,17 +65,14 @@ function runPowerShell(script) {
 }
 
 function spawnPowerShell(script, { onStdout, onStderr } = {}) {
+	const scriptPath = path.join(
+		os.tmpdir(),
+		`openscreen-powershell-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}.ps1`,
+	);
+	fs.writeFileSync(scriptPath, script, "utf8");
 	const child = spawn(
 		"powershell.exe",
-		[
-			"-NoLogo",
-			"-NoProfile",
-			"-NonInteractive",
-			"-ExecutionPolicy",
-			"Bypass",
-			"-EncodedCommand",
-			encodePowerShell(script),
-		],
+		["-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", scriptPath],
 		{ stdio: ["ignore", "pipe", "pipe"], windowsHide: true },
 	);
 
@@ -85,8 +82,15 @@ function spawnPowerShell(script, { onStdout, onStderr } = {}) {
 	child.stderr.on("data", (chunk) => onStderr?.(chunk));
 
 	const done = new Promise((resolve, reject) => {
-		child.once("error", reject);
+		const cleanup = () => {
+			fs.rmSync(scriptPath, { force: true });
+		};
+		child.once("error", (error) => {
+			cleanup();
+			reject(error);
+		});
 		child.once("exit", (code, signal) => {
+			cleanup();
 			if (code === 0 || child.killed) {
 				resolve({ code, signal });
 				return;
@@ -107,9 +111,26 @@ Add-Type -AssemblyName System.Windows.Forms
 
 $source = @"
 using System;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 public static class OpenScreenCursorDiagnosticInterop {
+    private const int WH_MOUSE_LL = 14;
+    private const int WM_LBUTTONDOWN = 0x0201;
+    private const int WM_LBUTTONUP = 0x0202;
+    private static readonly object MouseSync = new object();
+    private static int LeftDownCount = 0;
+    private static int LeftUpCount = 0;
+    private static IntPtr MouseHook = IntPtr.Zero;
+    private static LowLevelMouseProc MouseProcDelegate = MouseHookCallback;
+
+    public delegate IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam);
+
+    public struct MouseButtonEvents {
+        public int LeftDownCount;
+        public int LeftUpCount;
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     public struct POINT {
         public int X;
@@ -134,6 +155,48 @@ public static class OpenScreenCursorDiagnosticInterop {
         public IntPtr hbmColor;
     }
 
+    public static bool InstallMouseHook() {
+        if (MouseHook != IntPtr.Zero) {
+            return true;
+        }
+
+        using (Process process = Process.GetCurrentProcess())
+        using (ProcessModule module = process.MainModule) {
+            MouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseProcDelegate, GetModuleHandle(module.ModuleName), 0);
+        }
+
+        return MouseHook != IntPtr.Zero;
+    }
+
+    public static MouseButtonEvents ConsumeMouseButtonEvents() {
+        lock (MouseSync) {
+            MouseButtonEvents events = new MouseButtonEvents {
+                LeftDownCount = LeftDownCount,
+                LeftUpCount = LeftUpCount
+            };
+            LeftDownCount = 0;
+            LeftUpCount = 0;
+            return events;
+        }
+    }
+
+    private static IntPtr MouseHookCallback(int nCode, IntPtr wParam, IntPtr lParam) {
+        if (nCode >= 0) {
+            int message = wParam.ToInt32();
+            if (message == WM_LBUTTONDOWN || message == WM_LBUTTONUP) {
+                lock (MouseSync) {
+                    if (message == WM_LBUTTONDOWN) {
+                        LeftDownCount += 1;
+                    } else {
+                        LeftUpCount += 1;
+                    }
+                }
+            }
+        }
+
+        return CallNextHookEx(MouseHook, nCode, wParam, lParam);
+    }
+
     [DllImport("user32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetCursorInfo(ref CURSORINFO pci);
@@ -158,6 +221,15 @@ public static class OpenScreenCursorDiagnosticInterop {
     [DllImport("gdi32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool DeleteObject(IntPtr hObject);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern IntPtr SetWindowsHookEx(int idHook, LowLevelMouseProc lpfn, IntPtr hMod, uint dwThreadId);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    private static extern IntPtr GetModuleHandle(string lpModuleName);
 }
 "@
 
@@ -308,12 +380,15 @@ function Get-CursorAsset($cursorHandle, $cursorId) {
     }
 }
 
+[OpenScreenCursorDiagnosticInterop]::InstallMouseHook() | Out-Null
 [OpenScreenCursorDiagnosticInterop]::GetAsyncKeyState(0x01) | Out-Null
 Write-JsonLine @{ type = 'ready'; timestampMs = [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds() }
 
 $lastCursorId = $null
 $screenBounds = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds
 while ($true) {
+    [System.Windows.Forms.Application]::DoEvents()
+    $mouseEvents = [OpenScreenCursorDiagnosticInterop]::ConsumeMouseButtonEvents()
     $cursorInfo = New-Object OpenScreenCursorDiagnosticInterop+CURSORINFO
     $cursorInfo.cbSize = [Runtime.InteropServices.Marshal]::SizeOf([type][OpenScreenCursorDiagnosticInterop+CURSORINFO])
 
@@ -328,7 +403,8 @@ while ($true) {
     $cursorType = Get-StandardCursorType $cursorInfo.hCursor
     $leftButtonState = [OpenScreenCursorDiagnosticInterop]::GetAsyncKeyState(0x01)
     $leftButtonDown = ($leftButtonState -band 0x8000) -ne 0
-    $leftButtonPressed = ($leftButtonState -band 0x0001) -ne 0
+    $leftButtonPressed = ($mouseEvents.LeftDownCount -gt 0) -or (($leftButtonState -band 0x0001) -ne 0)
+    $leftButtonReleased = $mouseEvents.LeftUpCount -gt 0
     $asset = $null
 
     if ($visible -and $cursorId -and $cursorId -ne $lastCursorId) {
@@ -351,6 +427,7 @@ while ($true) {
         cursorType = $cursorType
         leftButtonDown = $leftButtonDown
         leftButtonPressed = $leftButtonPressed
+        leftButtonReleased = $leftButtonReleased
         bounds = @{
             x = $screenBounds.Left
             y = $screenBounds.Top
@@ -517,10 +594,11 @@ function toRecordingData(samples, assets) {
 
 		const leftButtonDown = sample.leftButtonDown === true;
 		const leftButtonPressed = sample.leftButtonPressed === true;
+		const leftButtonReleased = sample.leftButtonReleased === true;
 		const interactionType =
 			leftButtonPressed || (leftButtonDown && !previousLeftButtonDown)
 				? "click"
-				: !leftButtonDown && previousLeftButtonDown
+				: leftButtonReleased || (!leftButtonDown && previousLeftButtonDown)
 					? "mouseup"
 					: "move";
 		previousLeftButtonDown = leftButtonDown;

From 657b4a7ebebe330d2227d7682d9ba291166dd02b Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 21:53:06 +0200
Subject: [PATCH 26/38] docs: backlog native cursor click bounce

---
 .../windows-native-recorder-roadmap.md        | 33 +++++++++++++++++++
 docs/testing/windows-native-cursor.md         |  6 ++++
 2 files changed, 39 insertions(+)

diff --git a/docs/engineering/windows-native-recorder-roadmap.md b/docs/engineering/windows-native-recorder-roadmap.md
index 29986db50..146582a5c 100644
--- a/docs/engineering/windows-native-recorder-roadmap.md
+++ b/docs/engineering/windows-native-recorder-roadmap.md
@@ -206,6 +206,39 @@ Acceptance:
 - `npm run test:wgc-mic:win`: validates default-microphone capture writes an AAC track when an input endpoint is available.
 - `npm run test:wgc-mixed-audio:win`: validates system loopback plus microphone writes one mixed AAC track when endpoint formats are compatible.
 
+## Backlog
+
+### Native Cursor Click Bounce Is Not Visibly Applied
+
+Status: open. Do not treat Windows native cursor `Click Bounce` as shipped.
+
+Problem:
+
+- The cursor settings UI exposes `Size`, `Smoothing`, `Motion Blur`, and `Click Bounce`.
+- On Windows native cursor recordings, `Size`, `Smoothing`, and `Motion Blur` are visibly applied in preview/export.
+- `Click Bounce` still has no visible effect in manual packaged-app testing, even after adding click-related sample metadata.
+
+What has already been tried:
+
+- Added `interactionType: "click" | "mouseup" | "move"` to native cursor samples.
+- Added polling-based left-button state through `GetAsyncKeyState`.
+- Added the `GetAsyncKeyState` low-bit path to catch quick clicks between samples.
+- Added a PowerShell/C# `WH_MOUSE_LL` mouse hook experiment and launched the sampler through a temporary `.ps1` file to avoid Windows command-line length limits.
+- Updated `npm run test:cursor-native:win` so the diagnostic can observe a synthetic short click and emit `clickSampleCount`.
+
+Current diagnosis:
+
+- The diagnostic can observe synthetic click events, but this has not translated into a visible `Click Bounce` effect in the real packaged app.
+- The test currently proves that some click metadata can be recorded, not that the full OpenScreen record -> preview -> export path displays a bounce at the expected time.
+- The current native implementation may be animating from metadata that is not present in the real recording session, may be using the wrong timestamp origin, or may be applying a scale change too subtle to notice on the DOM/native cursor path.
+
+Next investigation when resumed:
+
+- Inspect the actual `.cursor.json`/session sidecar generated by a packaged-app manual recording and confirm whether real clicks produce `interactionType: "click"` at the right `timeMs`.
+- Add a targeted end-to-end fixture that records a known click, loads the generated project, and asserts the preview/export cursor scale changes across adjacent frames.
+- Compare the native DOM cursor path against the older `PixiCursorOverlay` click visual state and decide whether native cursor bounce should be a scale-only animation, an additional click ring, or a short explicit keyframe animation independent of sample cadence.
+- If event capture remains unreliable in the PowerShell sampler, move click events into a small native cursor helper instead of PowerShell/C# script injection.
+
 ## Ship Criteria
 
 - Windows display capture works with cursor, system audio, microphone, and webcam.
diff --git a/docs/testing/windows-native-cursor.md b/docs/testing/windows-native-cursor.md
index 4c7da9429..f6d214b59 100644
--- a/docs/testing/windows-native-cursor.md
+++ b/docs/testing/windows-native-cursor.md
@@ -84,6 +84,12 @@ Together, the scripts make it quick to inspect:
 
 They are not a full substitute for an end-to-end manual recording pass. Before shipping cursor changes, also test a real capture session and export from the packaged app.
 
+## Known Gap
+
+Windows native cursor `Click Bounce` is currently backlogged. `Size`, `Smoothing`, and `Motion Blur` can be validated through preview/export, but `Click Bounce` has not shown a visible effect in packaged-app manual testing. The current diagnostic can observe synthetic click metadata, but that is not enough to validate the real OpenScreen record -> preview -> export path.
+
+Track the open item in `docs/engineering/windows-native-recorder-roadmap.md` under `Native Cursor Click Bounce Is Not Visibly Applied`.
+
 ## Native Windows capture backend
 
 The app now routes Windows recordings through an external WGC helper instead of Electron `getDisplayMedia`. This is meant to remove the coordinate and clock split that made the reconstructed cursor drift in the preview/export path.

From 159b24efd2ee76484fe7d83e0dd4f51bbd8a0370 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 21:57:03 +0200
Subject: [PATCH 27/38] test: harden Windows cursor diagnostic

---
 .../windowsNativeRecordingSession.types.ts    |  2 +-
 scripts/test-windows-native-cursor.mjs        | 82 ++++++++++++++-----
 2 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
index 35a85948a..f3b69da0f 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.types.ts
@@ -18,7 +18,7 @@ export interface WindowsCursorSampleEvent {
 		width: number;
 		height: number;
 	} | null;
-	asset?: WindowsCursorAssetPayload;
+	asset: WindowsCursorAssetPayload | null;
 }
 
 export interface WindowsCursorReadyEvent {
diff --git a/scripts/test-windows-native-cursor.mjs b/scripts/test-windows-native-cursor.mjs
index 24f568ebf..44cabbe2b 100644
--- a/scripts/test-windows-native-cursor.mjs
+++ b/scripts/test-windows-native-cursor.mjs
@@ -3,10 +3,25 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
-const SAMPLE_INTERVAL_MS = Number(process.env.CURSOR_TEST_SAMPLE_INTERVAL_MS ?? 25);
-const DURATION_MS = Number(process.env.CURSOR_TEST_DURATION_MS ?? 1800);
-const SCREEN_FRAME_INTERVAL_MS = Number(process.env.CURSOR_TEST_SCREEN_FRAME_INTERVAL_MS ?? 100);
-const READY_TIMEOUT_MS = 5000;
+function readPositiveIntEnv(name, fallback) {
+	const raw = process.env[name];
+	if (raw === undefined) {
+		return fallback;
+	}
+
+	const parsed = Number(raw);
+	if (!Number.isFinite(parsed) || parsed <= 0) {
+		console.warn(`[cursor-native-test] ignoring invalid ${name}=${raw}; using ${fallback}`);
+		return fallback;
+	}
+
+	return Math.floor(parsed);
+}
+
+const SAMPLE_INTERVAL_MS = readPositiveIntEnv("CURSOR_TEST_SAMPLE_INTERVAL_MS", 25);
+const DURATION_MS = readPositiveIntEnv("CURSOR_TEST_DURATION_MS", 1800);
+const SCREEN_FRAME_INTERVAL_MS = readPositiveIntEnv("CURSOR_TEST_SCREEN_FRAME_INTERVAL_MS", 100);
+const READY_TIMEOUT_MS = readPositiveIntEnv("CURSOR_TEST_READY_TIMEOUT_MS", 5000);
 const OUTPUT_DIR =
 	process.env.CURSOR_TEST_OUTPUT_DIR ??
 	path.join(os.tmpdir(), `openscreen-cursor-native-${Date.now()}`);
@@ -550,22 +565,32 @@ while ($stopwatch.ElapsedMilliseconds -le ${durationMs + 700}) {
 `;
 }
 
-function waitForReady(events) {
-	return new Promise((resolve, reject) => {
-		const startedAt = Date.now();
-		const timer = setInterval(() => {
-			if (events.some((event) => event.type === "ready")) {
-				clearInterval(timer);
-				resolve();
+function createReadyWaiter() {
+	let settled = false;
+	let resolveReady = null;
+	const promise = new Promise((resolve, reject) => {
+		const timer = setTimeout(() => {
+			if (settled) {
 				return;
 			}
+			settled = true;
+			reject(new Error("Timed out waiting for cursor sampler readiness."));
+		}, READY_TIMEOUT_MS);
 
-			if (Date.now() - startedAt > READY_TIMEOUT_MS) {
-				clearInterval(timer);
-				reject(new Error("Timed out waiting for cursor sampler readiness."));
+		resolveReady = () => {
+			if (settled) {
+				return;
 			}
-		}, 25);
+			settled = true;
+			clearTimeout(timer);
+			resolve();
+		};
 	});
+
+	return {
+		promise,
+		resolve: () => resolveReady?.(),
+	};
 }
 
 function writeAssets(assets, outputDir) {
@@ -1113,10 +1138,15 @@ function findPlaywrightChromiumExecutable(defaultPath) {
 	const candidates = fs
 		.readdirSync(baseDir, { withFileTypes: true })
 		.filter((entry) => entry.isDirectory() && entry.name.startsWith("chromium-"))
-		.map((entry) => path.join(baseDir, entry.name, "chrome-win64", "chrome.exe"))
-		.filter((candidate) => fs.existsSync(candidate))
-		.sort()
-		.reverse();
+		.map((entry) => ({
+			executablePath: path.join(baseDir, entry.name, "chrome-win64", "chrome.exe"),
+			revision: Number.parseInt(entry.name.slice("chromium-".length), 10),
+		}))
+		.filter(
+			(candidate) => Number.isFinite(candidate.revision) && fs.existsSync(candidate.executablePath),
+		)
+		.sort((a, b) => b.revision - a.revision)
+		.map((candidate) => candidate.executablePath);
 
 	return candidates[0] ?? defaultPath;
 }
@@ -1169,6 +1199,7 @@ const events = [];
 const assets = new Map();
 let lineBuffer = "";
 let stoppingSampler = false;
+const readyWaiter = createReadyWaiter();
 const sampler = spawnPowerShell(buildSamplerScript(), {
 	onStdout: (chunk) => {
 		lineBuffer += chunk;
@@ -1181,8 +1212,17 @@ const sampler = spawnPowerShell(buildSamplerScript(), {
 				continue;
 			}
 
-			const event = JSON.parse(trimmed);
+			let event;
+			try {
+				event = JSON.parse(trimmed);
+			} catch {
+				process.stderr.write(`[cursor-native-test] dropping non-JSON line: ${trimmed}\n`);
+				continue;
+			}
 			events.push(event);
+			if (event.type === "ready") {
+				readyWaiter.resolve();
+			}
 			if (event.asset?.id && !assets.has(event.asset.id)) {
 				assets.set(event.asset.id, event.asset);
 			}
@@ -1197,7 +1237,7 @@ const sampler = spawnPowerShell(buildSamplerScript(), {
 let screenRecorder = null;
 
 try {
-	await waitForReady(events);
+	await readyWaiter.promise;
 	screenRecorder = spawnPowerShell(buildScreenRecorderScript(OUTPUT_DIR, DURATION_MS), {
 		onStderr: (chunk) => {
 			if (!chunk.startsWith("#< CLIXML") && !chunk.startsWith("<Objs")) {

From f609611de00da77fd4555d5af10b9a93c728c3fa Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 22:07:08 +0200
Subject: [PATCH 28/38] fix: address native cursor review findings

---
 .../windowsNativeRecordingSession.ts          | 20 ++++--
 src/components/video-editor/VideoEditor.tsx   | 25 ++++++-
 src/components/video-editor/VideoPlayback.tsx | 24 ++++++-
 src/lib/cursor/nativeCursor.ts                | 66 +++++++++++++------
 src/lib/exporter/frameRenderer.ts             |  1 +
 5 files changed, 110 insertions(+), 26 deletions(-)

diff --git a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
index 59acf80ad..dd4aab070 100644
--- a/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
+++ b/electron/native-bridge/cursor/recording/windowsNativeRecordingSession.ts
@@ -118,7 +118,13 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 			this.rejectReady(error);
 		});
 
-		await this.waitUntilReady();
+		try {
+			await this.waitUntilReady();
+		} catch (error) {
+			this.terminateHelperProcess();
+			this.cleanupHelperScript(helperScriptPath);
+			throw error;
+		}
 	}
 
 	async stop(): Promise<CursorRecordingData> {
@@ -126,9 +132,7 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 		this.process = null;
 		this.clearReadyState();
 
-		if (child && !child.killed) {
-			child.kill();
-		}
+		this.killHelperProcess(child);
 
 		this.logDiagnostic("stop", {
 			sampleCount: this.sampleCount,
@@ -287,8 +291,16 @@ export class WindowsNativeRecordingSession implements CursorRecordingSession {
 
 	private failHelper(error: Error) {
 		this.rejectReady(error);
+		this.terminateHelperProcess();
+	}
+
+	private terminateHelperProcess() {
 		const child = this.process;
 		this.process = null;
+		this.killHelperProcess(child);
+	}
+
+	private killHelperProcess(child: ChildProcessByStdio<null, Readable, Readable> | null) {
 		if (child && !child.killed) {
 			child.kill();
 		}
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index c0318e2f5..376b52ef7 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -82,6 +82,15 @@ import {
 } from "./types";
 import VideoPlayback, { VideoPlaybackRef } from "./VideoPlayback";
 
+function isClickInteractionType(interactionType: string | null | undefined) {
+	return (
+		interactionType === "click" ||
+		interactionType === "double-click" ||
+		interactionType === "right-click" ||
+		interactionType === "middle-click"
+	);
+}
+
 export default function VideoEditor() {
 	const {
 		state: editorState,
@@ -156,7 +165,19 @@ export default function VideoEditor() {
 		useCursorTelemetry(cursorTelemetrySourcePath);
 	const { data: cursorRecordingData, error: cursorRecordingDataError } =
 		useCursorRecordingData(cursorTelemetrySourcePath);
-	const cursorClickTimestamps = useMemo<number[]>(() => [], []);
+	const cursorClickTimestamps = useMemo<number[]>(() => {
+		const recordingClicks =
+			cursorRecordingData?.samples
+				.filter((sample) => isClickInteractionType(sample.interactionType))
+				.map((sample) => sample.timeMs) ?? [];
+		if (recordingClicks.length > 0) {
+			return recordingClicks;
+		}
+
+		return cursorTelemetry
+			.filter((sample) => isClickInteractionType(sample.interactionType))
+			.map((sample) => sample.timeMs);
+	}, [cursorRecordingData, cursorTelemetry]);
 
 	// Cursor & motion blur visual settings (non-undoable preferences)
 	const [showCursor, setShowCursor] = useState(true);
@@ -1947,6 +1968,8 @@ export default function VideoEditor() {
 											onBlurDataChange={handleBlurDataPreviewChange}
 											onBlurDataCommit={commitState}
 											cursorTelemetry={cursorTelemetry}
+											cursorHighlight={effectiveCursorHighlight}
+											cursorClickTimestamps={cursorClickTimestamps}
 											showCursor={showCursor}
 											cursorSize={cursorSize}
 											cursorSmoothing={cursorSmoothing}
diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsx
index 3c0f9787c..10eb8a0ce 100644
--- a/src/components/video-editor/VideoPlayback.tsx
+++ b/src/components/video-editor/VideoPlayback.tsx
@@ -187,6 +187,25 @@ function getResolvedVideoDuration(video: HTMLVideoElement): number | null {
 	return null;
 }
 
+function getEndedVideoDuration(video: HTMLVideoElement): number | null {
+	const currentTime = video.currentTime;
+	if (!Number.isFinite(currentTime) || currentTime <= 0) {
+		return null;
+	}
+
+	if (video.ended) {
+		return currentTime;
+	}
+
+	const resolvedDuration = getResolvedVideoDuration(video);
+	const durationEpsilonSeconds = 0.05;
+	if (resolvedDuration && currentTime >= resolvedDuration - durationEpsilonSeconds) {
+		return resolvedDuration;
+	}
+
+	return null;
+}
+
 const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 	(
 		{
@@ -384,9 +403,10 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
 						return true;
 					}
 
-					if (Number.isFinite(video.currentTime) && video.currentTime > 0) {
+					const endedDuration = getEndedVideoDuration(video);
+					if (endedDuration) {
 						lastResolvedDurationRef.current = null;
-						onDurationChange(Math.round(video.currentTime * 1000) / 1000);
+						onDurationChange(Math.round(endedDuration * 1000) / 1000);
 						return true;
 					}
 
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 0291b15ec..02f4d0637 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -59,6 +59,43 @@ function clamp(value: number, min: number, max: number) {
 
 const NATIVE_CURSOR_CLICK_ANIMATION_MS = 140;
 const NATIVE_CURSOR_MOTION_BLUR_MAX_PX = 6;
+const nativeCursorAssetMapCache = new WeakMap<
+	CursorRecordingData,
+	Map<string, NativeCursorAsset>
+>();
+
+function findNativeCursorSampleIndexAtOrBefore(samples: CursorRecordingSample[], timeMs: number) {
+	let low = 0;
+	let high = samples.length - 1;
+	let result = -1;
+
+	while (low <= high) {
+		const middle = low + Math.floor((high - low) / 2);
+		if (samples[middle].timeMs <= timeMs) {
+			result = middle;
+			low = middle + 1;
+		} else {
+			high = middle - 1;
+		}
+	}
+
+	return result;
+}
+
+function getNativeCursorAssetMap(recordingData: CursorRecordingData) {
+	const cached = nativeCursorAssetMapCache.get(recordingData);
+	if (cached) {
+		return cached;
+	}
+
+	const assetMap = new Map(recordingData.assets.map((asset) => [asset.id, asset]));
+	nativeCursorAssetMapCache.set(recordingData, assetMap);
+	return assetMap;
+}
+
+function getNativeCursorAsset(recordingData: CursorRecordingData, assetId: string) {
+	return getNativeCursorAssetMap(recordingData).get(assetId) ?? null;
+}
 
 interface PrettyNativeCursorAsset {
 	imageDataUrl: string;
@@ -296,12 +333,12 @@ export function getNativeCursorClickBounceProgress(
 		return 0;
 	}
 
-	for (let index = recordingData.samples.length - 1; index >= 0; index -= 1) {
+	for (
+		let index = findNativeCursorSampleIndexAtOrBefore(recordingData.samples, timeMs);
+		index >= 0;
+		index -= 1
+	) {
 		const sample = recordingData.samples[index];
-		if (sample.timeMs > timeMs) {
-			continue;
-		}
-
 		const ageMs = timeMs - sample.timeMs;
 		if (ageMs > NATIVE_CURSOR_CLICK_ANIMATION_MS) {
 			return 0;
@@ -397,17 +434,15 @@ export function resolveActiveNativeCursorFrame(
 		return null;
 	}
 
-	for (let index = recordingData.samples.length - 1; index >= 0; index -= 1) {
+	const index = findNativeCursorSampleIndexAtOrBefore(recordingData.samples, timeMs);
+	if (index >= 0) {
 		const sample = recordingData.samples[index];
-		if (sample.timeMs > timeMs) {
-			continue;
-		}
 
 		if (sample.visible === false || !sample.assetId) {
 			return null;
 		}
 
-		const asset = recordingData.assets.find((candidate) => candidate.id === sample.assetId);
+		const asset = getNativeCursorAsset(recordingData, sample.assetId);
 		if (!asset) {
 			return null;
 		}
@@ -427,14 +462,7 @@ export function resolveInterpolatedNativeCursorFrame(
 	}
 
 	const samples = recordingData.samples;
-	let activeIndex = -1;
-
-	for (let index = samples.length - 1; index >= 0; index -= 1) {
-		if (samples[index].timeMs <= timeMs) {
-			activeIndex = index;
-			break;
-		}
-	}
+	const activeIndex = findNativeCursorSampleIndexAtOrBefore(samples, timeMs);
 
 	if (activeIndex < 0) {
 		return null;
@@ -445,7 +473,7 @@ export function resolveInterpolatedNativeCursorFrame(
 		return null;
 	}
 
-	const asset = recordingData.assets.find((candidate) => candidate.id === activeSample.assetId);
+	const asset = getNativeCursorAsset(recordingData, activeSample.assetId);
 	if (!asset) {
 		return null;
 	}
diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.ts
index f2a30681a..d57155d00 100644
--- a/src/lib/exporter/frameRenderer.ts
+++ b/src/lib/exporter/frameRenderer.ts
@@ -602,6 +602,7 @@ export class FrameRenderer {
 			sample: displaySample,
 		});
 		if (!projectedPoint) {
+			resetNativeCursorSmoothingState(this.nativeCursorSmoothingState);
 			resetNativeCursorMotionBlurState(this.nativeCursorMotionBlurState);
 			return;
 		}

From eab205a06ddb33eb858ad5a81c466bf9e0bab79f Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 22:13:27 +0200
Subject: [PATCH 29/38] fix: harden native recorder review paths

---
 electron/ipc/handlers.ts                      |  28 ++-
 .../wgc-capture/src/dshow_webcam_capture.cpp  | 192 ++----------------
 src/hooks/useScreenRecorder.ts                |  23 ++-
 3 files changed, 57 insertions(+), 186 deletions(-)

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index da49612ed..e19942be9 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -67,6 +67,19 @@ function isPathAllowed(filePath: string): boolean {
 	return getAllowedReadDirs().some((dir) => isPathWithinDir(resolved, dir));
 }
 
+function resolveApprovedVideoPath(videoPath?: string | null): string | null {
+	const normalizedPath = normalizeVideoSourcePath(videoPath);
+	if (!normalizedPath) {
+		return null;
+	}
+
+	if (!hasAllowedImportVideoExtension(normalizedPath) || !isPathAllowed(normalizedPath)) {
+		return null;
+	}
+
+	return normalizedPath;
+}
+
 /**
  * Helper function to build dialog options with a parent window only when it's valid.
  * This prevents passing stale or destroyed BrowserWindow references to dialog calls.
@@ -1319,7 +1332,7 @@ export function registerIpcHandlers(
 	});
 
 	ipcMain.handle("get-cursor-telemetry", async (_, videoPath?: string) => {
-		const targetVideoPath = normalizeVideoSourcePath(
+		const targetVideoPath = resolveApprovedVideoPath(
 			videoPath ?? currentRecordingSession?.screenVideoPath,
 		);
 		if (!targetVideoPath) {
@@ -1413,11 +1426,18 @@ export function registerIpcHandlers(
 				return { success: false, canceled: true };
 			}
 
-			approveFilePath(result.filePaths[0]);
+			const normalizedPath = await approveReadableVideoPath(result.filePaths[0]);
+			if (!normalizedPath) {
+				return {
+					success: false,
+					message: "Selected file is not a supported readable video file",
+				};
+			}
+
 			currentProjectPath = null;
 			return {
 				success: true,
-				path: result.filePaths[0],
+				path: normalizedPath,
 			};
 		} catch (error) {
 			console.error("Failed to open file picker:", error);
@@ -1727,7 +1747,7 @@ export function registerIpcHandlers(
 		clearCurrentVideoPath,
 		resolveAssetBasePath,
 		resolveVideoPath: (videoPath?: string | null) =>
-			normalizeVideoSourcePath(videoPath ?? currentVideoPath),
+			resolveApprovedVideoPath(videoPath ?? currentVideoPath),
 		loadCursorRecordingData: readCursorRecordingFile,
 		loadCursorTelemetry: readCursorTelemetryFile,
 	});
diff --git a/electron/native/wgc-capture/src/dshow_webcam_capture.cpp b/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
index 6e0ec4f8f..14cb888c9 100644
--- a/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
+++ b/electron/native/wgc-capture/src/dshow_webcam_capture.cpp
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 #include <chrono>
-#include <cwctype>
+#include <exception>
 #include <iostream>
 
 namespace {
@@ -43,115 +43,6 @@ bool succeeded(HRESULT hr, const char* label) {
     return false;
 }
 
-std::wstring readPropertyString(IPropertyBag* bag, LPCOLESTR key) {
-    VARIANT value;
-    VariantInit(&value);
-    if (FAILED(bag->Read(key, &value, nullptr)) || value.vt != VT_BSTR || !value.bstrVal) {
-        VariantClear(&value);
-        return {};
-    }
-
-    std::wstring result(value.bstrVal);
-    VariantClear(&value);
-    return result;
-}
-
-bool containsInsensitive(const std::wstring& haystack, const std::wstring& needle) {
-    if (haystack.empty() || needle.empty()) {
-        return false;
-    }
-
-    std::wstring lowerHaystack = haystack;
-    std::wstring lowerNeedle = needle;
-    std::transform(lowerHaystack.begin(), lowerHaystack.end(), lowerHaystack.begin(), ::towlower);
-    std::transform(lowerNeedle.begin(), lowerNeedle.end(), lowerNeedle.begin(), ::towlower);
-    return lowerHaystack.find(lowerNeedle) != std::wstring::npos ||
-        lowerNeedle.find(lowerHaystack) != std::wstring::npos;
-}
-
-std::wstring normalizeDeviceName(const std::wstring& value) {
-    std::wstring normalized;
-    normalized.reserve(value.size());
-    bool lastWasSpace = true;
-    for (const wchar_t ch : value) {
-        if (std::iswalnum(ch)) {
-            normalized.push_back(static_cast<wchar_t>(std::towlower(ch)));
-            lastWasSpace = false;
-            continue;
-        }
-        if (!lastWasSpace) {
-            normalized.push_back(L' ');
-            lastWasSpace = true;
-        }
-    }
-    while (!normalized.empty() && normalized.back() == L' ') {
-        normalized.pop_back();
-    }
-    return normalized;
-}
-
-std::vector<std::wstring> splitWords(const std::wstring& value) {
-    std::vector<std::wstring> words;
-    size_t start = 0;
-    while (start < value.size()) {
-        const size_t end = value.find(L' ', start);
-        const auto word = value.substr(start, end == std::wstring::npos ? std::wstring::npos : end - start);
-        if (word.size() > 1 && word != L"camera" && word != L"webcam" && word != L"video" && word != L"input") {
-            words.push_back(word);
-        }
-        if (end == std::wstring::npos) {
-            break;
-        }
-        start = end + 1;
-    }
-    return words;
-}
-
-int deviceMatchScore(
-    const std::wstring& candidateName,
-    const std::wstring& candidatePath,
-    const std::wstring& requestedName,
-    const std::wstring& requestedId) {
-    int score = 0;
-    const auto normalizedName = normalizeDeviceName(candidateName);
-    const auto normalizedPath = normalizeDeviceName(candidatePath);
-    const auto normalizedRequestedName = normalizeDeviceName(requestedName);
-    const auto normalizedRequestedId = normalizeDeviceName(requestedId);
-
-    if (!normalizedRequestedName.empty()) {
-        if (normalizedName == normalizedRequestedName) {
-            score = std::max(score, 1000);
-        }
-        if (containsInsensitive(normalizedName, normalizedRequestedName)) {
-            score = std::max(score, 900);
-        }
-        if (containsInsensitive(normalizedPath, normalizedRequestedName)) {
-            score = std::max(score, 800);
-        }
-
-        int wordScore = 0;
-        for (const auto& word : splitWords(normalizedRequestedName)) {
-            if (normalizedName.find(word) != std::wstring::npos) {
-                wordScore += 100;
-            } else if (normalizedPath.find(word) != std::wstring::npos) {
-                wordScore += 50;
-            }
-        }
-        score = std::max(score, wordScore);
-    }
-
-    if (!normalizedRequestedId.empty()) {
-        if (containsInsensitive(normalizedPath, normalizedRequestedId)) {
-            score = std::max(score, 700);
-        }
-        if (containsInsensitive(normalizedName, normalizedRequestedId)) {
-            score = std::max(score, 600);
-        }
-    }
-
-    return score;
-}
-
 void freeMediaType(AM_MEDIA_TYPE& type) {
     if (type.cbFormat != 0) {
         CoTaskMemFree(type.pbFormat);
@@ -164,70 +55,6 @@ void freeMediaType(AM_MEDIA_TYPE& type) {
     }
 }
 
-bool readRegistryString(HKEY key, const wchar_t* valueName, std::wstring& value) {
-    DWORD type = 0;
-    DWORD size = 0;
-    if (RegGetValueW(key, nullptr, valueName, RRF_RT_REG_SZ, &type, nullptr, &size) != ERROR_SUCCESS || size == 0) {
-        return false;
-    }
-
-    std::wstring buffer(size / sizeof(wchar_t), L'\0');
-    if (RegGetValueW(key, nullptr, valueName, RRF_RT_REG_SZ, &type, buffer.data(), &size) != ERROR_SUCCESS) {
-        return false;
-    }
-    while (!buffer.empty() && buffer.back() == L'\0') {
-        buffer.pop_back();
-    }
-    value = buffer;
-    return true;
-}
-
-bool findRegisteredVideoInput(
-    const std::wstring& deviceId,
-    const std::wstring& deviceName,
-    CLSID& selectedClsid,
-    std::wstring& selectedName,
-    int& bestScore) {
-    HKEY instanceKey = nullptr;
-    if (RegOpenKeyExW(
-            HKEY_CLASSES_ROOT,
-            L"CLSID\\{860BB310-5D01-11D0-BD3B-00A0C911CE86}\\Instance",
-            0,
-            KEY_READ,
-            &instanceKey) != ERROR_SUCCESS) {
-        return false;
-    }
-
-    DWORD index = 0;
-    wchar_t subkeyName[128];
-    DWORD subkeyNameLength = ARRAYSIZE(subkeyName);
-    bool found = false;
-    while (RegEnumKeyExW(instanceKey, index, subkeyName, &subkeyNameLength, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS) {
-        HKEY filterKey = nullptr;
-        if (RegOpenKeyExW(instanceKey, subkeyName, 0, KEY_READ, &filterKey) == ERROR_SUCCESS) {
-            std::wstring friendlyName;
-            std::wstring clsidText;
-            readRegistryString(filterKey, L"FriendlyName", friendlyName);
-            readRegistryString(filterKey, L"CLSID", clsidText);
-            const int score = deviceMatchScore(friendlyName, clsidText, deviceName, deviceId);
-            std::wcerr << L"INFO: Registered DirectShow webcam candidate name=\"" << friendlyName << L"\" score=" << score << std::endl;
-            CLSID clsid{};
-            if (!clsidText.empty() && SUCCEEDED(CLSIDFromString(clsidText.c_str(), &clsid)) && (!found || score > bestScore)) {
-                selectedClsid = clsid;
-                selectedName = friendlyName;
-                bestScore = score;
-                found = true;
-            }
-            RegCloseKey(filterKey);
-        }
-        index += 1;
-        subkeyNameLength = ARRAYSIZE(subkeyName);
-    }
-
-    RegCloseKey(instanceKey);
-    return found;
-}
-
 } // namespace
 
 struct DirectShowWebcamCapture::Impl {
@@ -254,6 +81,7 @@ bool DirectShowWebcamCapture::initialize(
     int requestedWidth,
     int requestedHeight,
     int requestedFps) {
+    (void)deviceId;
     stop();
     delete impl_;
     impl_ = nullptr;
@@ -371,9 +199,21 @@ bool DirectShowWebcamCapture::start() {
     if (!succeeded(hr, "Run(DirectShow webcam)")) {
         return false;
     }
-    impl_->running = true;
     stopRequested_ = false;
-    thread_ = std::thread(&DirectShowWebcamCapture::captureLoop, this);
+    try {
+        thread_ = std::thread(&DirectShowWebcamCapture::captureLoop, this);
+    } catch (const std::exception& error) {
+        stopRequested_ = true;
+        impl_->mediaControl->Stop();
+        std::cerr << "ERROR: Failed to start DirectShow webcam capture thread: " << error.what() << std::endl;
+        return false;
+    } catch (...) {
+        stopRequested_ = true;
+        impl_->mediaControl->Stop();
+        std::cerr << "ERROR: Failed to start DirectShow webcam capture thread" << std::endl;
+        return false;
+    }
+    impl_->running = true;
     return true;
 }
 
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 46340377f..4971ff7a0 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -402,24 +402,30 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		}
 
 		activeNativeRecording.finalizing = true;
-		nativeWindowsRecording.current = null;
-		setRecording(false);
-		setPaused(false);
-		setElapsedSeconds(0);
-		accumulatedDurationMs.current = 0;
-		segmentStartedAt.current = null;
+
+		const clearNativeRecordingState = () => {
+			nativeWindowsRecording.current = null;
+			setRecording(false);
+			setPaused(false);
+			setElapsedSeconds(0);
+			accumulatedDurationMs.current = 0;
+			segmentStartedAt.current = null;
+		};
 
 		try {
 			const result = await window.electronAPI.stopNativeWindowsRecording(discard);
 			if (discard || result.discarded) {
+				clearNativeRecordingState();
 				return true;
 			}
 			if (!result.success) {
 				console.error("Failed to stop native Windows recording:", result.error);
 				toast.error(result.error ?? "Failed to stop native Windows recording");
+				activeNativeRecording.finalizing = false;
 				return true;
 			}
 
+			clearNativeRecordingState();
 			if (result.session) {
 				await window.electronAPI.setCurrentRecordingSession(result.session);
 			} else if (result.path) {
@@ -433,6 +439,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			toast.error(
 				error instanceof Error ? error.message : "Failed to save native Windows recording",
 			);
+			activeNativeRecording.finalizing = false;
 			return true;
 		} finally {
 			if (discardRecordingId.current === activeNativeRecording.recordingId) {
@@ -582,6 +589,10 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 
 			const availability = await window.electronAPI.isNativeWindowsCaptureAvailable();
 			if (!availability.success || !availability.available) {
+				if (availability.reason === "unsupported-os") {
+					return false;
+				}
+
 				throw new Error(
 					availability.reason === "missing-helper"
 						? "Native Windows capture helper is not available."

From 5b7f380456fc7ea4bdd6036b2cfcb10fd684752a Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 22:39:23 +0200
Subject: [PATCH 30/38] fix: make native cursor click bounce visible

---
 src/lib/cursor/nativeCursor.test.ts | 34 +++++++++++++++++++++++++++++
 src/lib/cursor/nativeCursor.ts      | 16 +++++++++-----
 2 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 src/lib/cursor/nativeCursor.test.ts

diff --git a/src/lib/cursor/nativeCursor.test.ts b/src/lib/cursor/nativeCursor.test.ts
new file mode 100644
index 000000000..1b919d65d
--- /dev/null
+++ b/src/lib/cursor/nativeCursor.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from "vitest";
+import {
+	getNativeCursorClickBounceProgress,
+	getNativeCursorClickBounceScale,
+} from "./nativeCursor";
+
+describe("native cursor click bounce", () => {
+	it("keeps click progress visible across several frames", () => {
+		const recordingData = {
+			version: 2,
+			provider: "native" as const,
+			assets: [],
+			samples: [
+				{ timeMs: 0, cx: 0.5, cy: 0.5, interactionType: "move" as const },
+				{ timeMs: 100, cx: 0.5, cy: 0.5, interactionType: "click" as const },
+				{ timeMs: 133, cx: 0.5, cy: 0.5, interactionType: "move" as const },
+				{ timeMs: 166, cx: 0.5, cy: 0.5, interactionType: "move" as const },
+				{ timeMs: 200, cx: 0.5, cy: 0.5, interactionType: "move" as const },
+				{ timeMs: 300, cx: 0.5, cy: 0.5, interactionType: "move" as const },
+			],
+		};
+
+		expect(getNativeCursorClickBounceProgress(recordingData, 133)).toBeGreaterThan(0);
+		expect(getNativeCursorClickBounceProgress(recordingData, 200)).toBeGreaterThan(0);
+		expect(getNativeCursorClickBounceProgress(recordingData, 400)).toBe(0);
+	});
+
+	it("applies a visible press and rebound scale at high intensity", () => {
+		expect(getNativeCursorClickBounceScale(5, 1)).toBe(1);
+		expect(getNativeCursorClickBounceScale(5, 0.82)).toBeLessThan(0.9);
+		expect(getNativeCursorClickBounceScale(5, 0.28)).toBeGreaterThan(1.05);
+		expect(getNativeCursorClickBounceScale(5, 0)).toBe(1);
+	});
+});
diff --git a/src/lib/cursor/nativeCursor.ts b/src/lib/cursor/nativeCursor.ts
index 02f4d0637..9ce308a80 100644
--- a/src/lib/cursor/nativeCursor.ts
+++ b/src/lib/cursor/nativeCursor.ts
@@ -57,7 +57,7 @@ function clamp(value: number, min: number, max: number) {
 	return Math.min(max, Math.max(min, value));
 }
 
-const NATIVE_CURSOR_CLICK_ANIMATION_MS = 140;
+const NATIVE_CURSOR_CLICK_ANIMATION_MS = 260;
 const NATIVE_CURSOR_MOTION_BLUR_MAX_PX = 6;
 const nativeCursorAssetMapCache = new WeakMap<
 	CursorRecordingData,
@@ -329,7 +329,7 @@ export function getNativeCursorClickBounceProgress(
 	recordingData: CursorRecordingData | null | undefined,
 	timeMs: number,
 ) {
-	if (!hasNativeCursorRecordingData(recordingData)) {
+	if (!recordingData || recordingData.provider !== "native" || recordingData.samples.length === 0) {
 		return 0;
 	}
 
@@ -357,9 +357,15 @@ export function getNativeCursorClickBounceScale(clickBounce: number, progress: n
 		return 1;
 	}
 
-	const bounceAmount = Math.sin(progress * Math.PI);
-	const amplitude = clamp(clickBounce, 0, 4) * 0.08;
-	return Math.max(0.72, 1 - bounceAmount * amplitude);
+	const intensity = clamp(clickBounce, 0, 5) / 5;
+	const elapsed = 1 - clamp(progress, 0, 1);
+	if (elapsed < 0.38) {
+		const pressProgress = Math.sin((elapsed / 0.38) * Math.PI);
+		return 1 - pressProgress * intensity * 0.24;
+	}
+
+	const reboundProgress = Math.sin(((elapsed - 0.38) / 0.62) * Math.PI);
+	return 1 + reboundProgress * intensity * 0.16;
 }
 
 export function getNativeCursorMotionBlurPx({

From bdbb67cb0dd9c7009d6a4b50f6a66ba6215f0851 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Tue, 5 May 2026 22:55:33 +0200
Subject: [PATCH 31/38] fix: preserve native cursor click interactions

---
 electron/ipc/handlers.ts                      |   7 ++
 package.json                                  |   1 +
 .../inspect-native-cursor-click-bounce.mjs    | 110 ++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 scripts/inspect-native-cursor-click-bounce.mjs

diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index e19942be9..0746e7faa 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -279,6 +279,12 @@ function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 	}
 
 	const point = sample as Partial<CursorRecordingSample>;
+	const interactionType =
+		point.interactionType === "click" ||
+		point.interactionType === "mouseup" ||
+		point.interactionType === "move"
+			? point.interactionType
+			: "move";
 	return {
 		timeMs:
 			typeof point.timeMs === "number" && Number.isFinite(point.timeMs)
@@ -289,6 +295,7 @@ function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
 		assetId: typeof point.assetId === "string" ? point.assetId : null,
 		visible: typeof point.visible === "boolean" ? point.visible : true,
 		cursorType: typeof point.cursorType === "string" ? point.cursorType : null,
+		interactionType,
 	};
 }
 
diff --git a/package.json b/package.json
index 9833eda98..0bd0d576b 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
 		"test:wgc-webcam:win": "node scripts/test-windows-wgc-helper.mjs --webcam",
 		"test:wgc-full:win": "node scripts/test-windows-wgc-helper.mjs --webcam --system-audio --microphone",
 		"capture:openscreen-preview": "node scripts/capture-openscreen-preview.mjs",
+		"inspect:cursor-click-bounce": "node scripts/inspect-native-cursor-click-bounce.mjs",
 		"build-vite": "tsc && vite build",
 		"test:browser": "vitest --config vitest.browser.config.ts --run",
 		"test:browser:install": "playwright install --with-deps chromium-headless-shell",
diff --git a/scripts/inspect-native-cursor-click-bounce.mjs b/scripts/inspect-native-cursor-click-bounce.mjs
new file mode 100644
index 000000000..870ee8d43
--- /dev/null
+++ b/scripts/inspect-native-cursor-click-bounce.mjs
@@ -0,0 +1,110 @@
+#!/usr/bin/env node
+import fs from "node:fs";
+import path from "node:path";
+
+const CLICK_ANIMATION_MS = 260;
+
+function usage() {
+	console.error(
+		"Usage: node scripts/inspect-native-cursor-click-bounce.mjs <video-or-cursor-json-path> [--bounce=5]",
+	);
+	process.exit(1);
+}
+
+function getCursorJsonPath(inputPath) {
+	if (!inputPath) {
+		usage();
+	}
+
+	const resolved = path.resolve(inputPath);
+	if (resolved.endsWith(".cursor.json")) {
+		return resolved;
+	}
+	return `${resolved}.cursor.json`;
+}
+
+function getBounceValue() {
+	const arg = process.argv.find((value) => value.startsWith("--bounce="));
+	const parsed = Number(arg?.slice("--bounce=".length) ?? 5);
+	return Number.isFinite(parsed) ? Math.min(5, Math.max(0, parsed)) : 5;
+}
+
+function clickBounceProgress(samples, timeMs) {
+	for (let index = samples.length - 1; index >= 0; index -= 1) {
+		const sample = samples[index];
+		if (sample.timeMs > timeMs) {
+			continue;
+		}
+
+		const ageMs = timeMs - sample.timeMs;
+		if (ageMs > CLICK_ANIMATION_MS) {
+			return 0;
+		}
+
+		if (sample.interactionType === "click") {
+			return 1 - ageMs / CLICK_ANIMATION_MS;
+		}
+	}
+
+	return 0;
+}
+
+function clickBounceScale(clickBounce, progress) {
+	if (progress <= 0 || clickBounce <= 0) {
+		return 1;
+	}
+
+	const intensity = Math.min(5, Math.max(0, clickBounce)) / 5;
+	const elapsed = 1 - Math.min(1, Math.max(0, progress));
+	if (elapsed < 0.38) {
+		const pressProgress = Math.sin((elapsed / 0.38) * Math.PI);
+		return 1 - pressProgress * intensity * 0.24;
+	}
+
+	const reboundProgress = Math.sin(((elapsed - 0.38) / 0.62) * Math.PI);
+	return 1 + reboundProgress * intensity * 0.16;
+}
+
+const cursorJsonPath = getCursorJsonPath(process.argv[2]);
+const clickBounce = getBounceValue();
+const parsed = JSON.parse(fs.readFileSync(cursorJsonPath, "utf8"));
+const samples = (Array.isArray(parsed) ? parsed : (parsed.samples ?? [])).sort(
+	(a, b) => (a.timeMs ?? 0) - (b.timeMs ?? 0),
+);
+const clicks = samples.filter((sample) => sample.interactionType === "click");
+
+const windows = clicks.slice(0, 8).map((click) => {
+	const times = [0, 33, 66, 100, 133, 166, 200, 233, 260].map(
+		(offsetMs) => click.timeMs + offsetMs,
+	);
+	return {
+		clickTimeMs: click.timeMs,
+		cursorType: click.cursorType ?? null,
+		assetId: click.assetId ?? null,
+		scales: times.map((timeMs) => ({
+			timeMs,
+			progress: Number(clickBounceProgress(samples, timeMs).toFixed(3)),
+			scale: Number(clickBounceScale(clickBounce, clickBounceProgress(samples, timeMs)).toFixed(3)),
+		})),
+	};
+});
+
+const report = {
+	cursorJsonPath,
+	provider: parsed.provider ?? (Array.isArray(parsed) ? "legacy-array" : null),
+	sampleCount: samples.length,
+	assetCount: Array.isArray(parsed.assets) ? parsed.assets.length : 0,
+	clickCount: clicks.length,
+	interactionCounts: samples.reduce((counts, sample) => {
+		const key = sample.interactionType ?? "missing";
+		counts[key] = (counts[key] ?? 0) + 1;
+		return counts;
+	}, {}),
+	clickBounce,
+	windows,
+};
+
+console.log(JSON.stringify(report, null, 2));
+if (clicks.length === 0) {
+	process.exitCode = 2;
+}

From 249658d7a5b813be69b6cc4ffe71a008360d7c18 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 14:17:45 +0200
Subject: [PATCH 32/38] fix: address maintainer platform regressions

---
 electron-builder.json5                        | 27 ++++---
 electron/ipc/handlers.ts                      |  9 +++
 .../native-bridge/cursor/recording/factory.ts | 24 ++++--
 src/hooks/useScreenRecorder.ts                | 68 +++++++++++++---
 src/lib/exporter/audioEncoder.ts              | 81 +++++++++++++++++--
 src/lib/exporter/muxer.ts                     |  8 +-
 src/lib/exporter/videoExporter.ts             | 16 +++-
 7 files changed, 189 insertions(+), 44 deletions(-)

diff --git a/electron-builder.json5 b/electron-builder.json5
index 7c7c3850a..9299fc761 100644
--- a/electron-builder.json5
+++ b/electron-builder.json5
@@ -6,8 +6,7 @@
   // .node binaries can't be dlopen'd from inside an asar — must live unpacked.
   "asarUnpack": [
     "node_modules/uiohook-napi/**/*",
-    "**/*.node",
-    "electron/native/bin/**"
+    "**/*.node"
   ],
   "productName": "Openscreen",
   "npmRebuild": true,
@@ -19,10 +18,9 @@
   "files": [
     "dist",
     "dist-electron",
-    "electron/native/bin/**/*",
     "!*.png",
-    "!preview*.png",
-    "!*.md",
+    "!preview*.png",
+    "!*.md",
     "!README.md",
     "!CONTRIBUTING.md",
     "!LICENSE"
@@ -67,12 +65,19 @@
     "artifactName": "${productName}-Linux-${version}.${ext}",
     "category": "AudioVideo"
   },
-  "win": {
-    "target": [
-      "nsis"
-    ],
-    "icon": "icons/icons/win/icon.ico"
-  },
+  "win": {
+    "target": [
+      "nsis"
+    ],
+    "icon": "icons/icons/win/icon.ico",
+    "extraResources": [
+      {
+        "from": "electron/native/bin",
+        "to": "electron/native/bin",
+        "filter": ["**/*"]
+      }
+    ]
+  },
   "nsis": {
     "oneClick": false,
     "allowToChangeInstallationDirectory": true
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index 0746e7faa..e9f45672e 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -451,6 +451,14 @@ function resolveUnpackedAppPath(...segments: string[]) {
 	return resolved;
 }
 
+function resolvePackagedResourcePath(...segments: string[]) {
+	if (!app.isPackaged) {
+		return null;
+	}
+
+	return path.join(process.resourcesPath, ...segments);
+}
+
 function getNativeWindowsCaptureHelperCandidates() {
 	const envPath = process.env.OPENSCREEN_WGC_CAPTURE_EXE?.trim();
 	const archTag = process.arch === "arm64" ? "win32-arm64" : "win32-x64";
@@ -466,6 +474,7 @@ function getNativeWindowsCaptureHelperCandidates() {
 		),
 		resolveUnpackedAppPath("electron", "native", "wgc-capture", "build", "wgc-capture.exe"),
 		resolveUnpackedAppPath("electron", "native", "bin", archTag, "wgc-capture.exe"),
+		resolvePackagedResourcePath("electron", "native", "bin", archTag, "wgc-capture.exe"),
 	].filter((candidate): candidate is string => Boolean(candidate));
 }
 
diff --git a/electron/native-bridge/cursor/recording/factory.ts b/electron/native-bridge/cursor/recording/factory.ts
index 52d607909..783584117 100644
--- a/electron/native-bridge/cursor/recording/factory.ts
+++ b/electron/native-bridge/cursor/recording/factory.ts
@@ -1,6 +1,6 @@
 import type { Rectangle } from "electron";
+import type { CursorRecordingData } from "../../../../src/native/contracts";
 import type { CursorRecordingSession } from "./session";
-import { TelemetryRecordingSession } from "./telemetryRecordingSession";
 import { WindowsNativeRecordingSession } from "./windowsNativeRecordingSession";
 
 interface CreateCursorRecordingSessionOptions {
@@ -12,6 +12,21 @@ interface CreateCursorRecordingSessionOptions {
 	startTimeMs?: number;
 }
 
+class NoopCursorRecordingSession implements CursorRecordingSession {
+	async start(): Promise<void> {
+		// Native cursor capture is currently Windows-only.
+	}
+
+	async stop(): Promise<CursorRecordingData> {
+		return {
+			version: 2,
+			provider: "none",
+			assets: [],
+			samples: [],
+		};
+	}
+}
+
 export function createCursorRecordingSession(
 	options: CreateCursorRecordingSessionOptions,
 ): CursorRecordingSession {
@@ -25,10 +40,5 @@ export function createCursorRecordingSession(
 		});
 	}
 
-	return new TelemetryRecordingSession({
-		getDisplayBounds: options.getDisplayBounds,
-		maxSamples: options.maxSamples,
-		sampleIntervalMs: options.sampleIntervalMs,
-		startTimeMs: options.startTimeMs,
-	});
+	return new NoopCursorRecordingSession();
 }
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 4971ff7a0..1c39e29eb 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -9,6 +9,7 @@ import {
 import { requestCameraAccess } from "@/lib/requestCameraAccess";
 
 const TARGET_FRAME_RATE = 60;
+const MIN_FRAME_RATE = 30;
 const TARGET_WIDTH = 3840;
 const TARGET_HEIGHT = 2160;
 const FOUR_K_PIXELS = TARGET_WIDTH * TARGET_HEIGHT;
@@ -29,6 +30,7 @@ const CODEC_ALIGNMENT = 2;
 
 const RECORDER_TIMESLICE_MS = 1000;
 const BITS_PER_MEGABIT = 1_000_000;
+const CHROME_MEDIA_SOURCE = "desktop";
 const RECORDING_FILE_PREFIX = "recording-";
 const VIDEO_FILE_EXTENSION = ".webm";
 const WEBCAM_FILE_SUFFIX = "-webcam";
@@ -759,20 +761,60 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			}
 
 			let screenMediaStream: MediaStream;
+			const platform = await window.electronAPI.getPlatform();
 
-			// getDisplayMedia + setDisplayMediaRequestHandler (main.ts) supplies the
-			// pre-selected source and honors cursor:"never" to exclude the system cursor
-			// from every captured frame. System audio is provided via WASAPI loopback
-			// on Windows when the user has enabled it.
-			screenMediaStream = await navigator.mediaDevices.getDisplayMedia({
-				video: {
-					cursor: "never",
-					width: { max: TARGET_WIDTH },
-					height: { max: TARGET_HEIGHT },
-					frameRate: { ideal: TARGET_FRAME_RATE },
-				} as MediaTrackConstraints,
-				audio: systemAudioEnabled,
-			} as DisplayMediaStreamOptions);
+			if (platform === "win32") {
+				// getDisplayMedia + setDisplayMediaRequestHandler (main.ts) supplies the
+				// pre-selected source and honors cursor:"never" to exclude the system cursor
+				// from every captured frame. System audio is provided via WASAPI loopback
+				// on Windows when the user has enabled it.
+				screenMediaStream = await navigator.mediaDevices.getDisplayMedia({
+					video: {
+						cursor: "never",
+						width: { max: TARGET_WIDTH },
+						height: { max: TARGET_HEIGHT },
+						frameRate: { ideal: TARGET_FRAME_RATE },
+					} as MediaTrackConstraints,
+					audio: systemAudioEnabled,
+				} as DisplayMediaStreamOptions);
+			} else {
+				const videoConstraints = {
+					mandatory: {
+						chromeMediaSource: CHROME_MEDIA_SOURCE,
+						chromeMediaSourceId: selectedSource.id,
+						maxWidth: TARGET_WIDTH,
+						maxHeight: TARGET_HEIGHT,
+						maxFrameRate: TARGET_FRAME_RATE,
+						minFrameRate: MIN_FRAME_RATE,
+					},
+				};
+
+				if (systemAudioEnabled) {
+					try {
+						screenMediaStream = await navigator.mediaDevices.getUserMedia({
+							audio: {
+								mandatory: {
+									chromeMediaSource: CHROME_MEDIA_SOURCE,
+									chromeMediaSourceId: selectedSource.id,
+								},
+							},
+							video: videoConstraints,
+						} as unknown as MediaStreamConstraints);
+					} catch (audioErr) {
+						console.warn("System audio capture failed, falling back to video-only:", audioErr);
+						toast.error(t("recording.systemAudioUnavailable"));
+						screenMediaStream = await navigator.mediaDevices.getUserMedia({
+							audio: false,
+							video: videoConstraints,
+						} as unknown as MediaStreamConstraints);
+					}
+				} else {
+					screenMediaStream = await navigator.mediaDevices.getUserMedia({
+						audio: false,
+						video: videoConstraints,
+					} as unknown as MediaStreamConstraints);
+				}
+			}
 			screenStream.current = screenMediaStream;
 
 			if (!isCountdownRunActive(countdownRunToken)) {
diff --git a/src/lib/exporter/audioEncoder.ts b/src/lib/exporter/audioEncoder.ts
index 3237af265..870fdc389 100644
--- a/src/lib/exporter/audioEncoder.ts
+++ b/src/lib/exporter/audioEncoder.ts
@@ -1,16 +1,66 @@
 import { WebDemuxer } from "web-demuxer";
 import type { SpeedRegion, TrimRegion } from "@/components/video-editor/types";
-import type { VideoMuxer } from "./muxer";
+import type { ExportAudioMuxerCodec, VideoMuxer } from "./muxer";
 
 const AUDIO_BITRATE = 128_000;
-const EXPORT_AUDIO_CODEC = "mp4a.40.2";
 const DECODE_BACKPRESSURE_LIMIT = 20;
 const MIN_SPEED_REGION_DELTA_MS = 0.0001;
 const SEEK_TIMEOUT_MS = 5_000;
 
+export interface ExportAudioCodec {
+	encoderCodec: string;
+	muxerCodec: ExportAudioMuxerCodec;
+	label: string;
+}
+
+const EXPORT_AUDIO_CODECS: ExportAudioCodec[] = [
+	{ encoderCodec: "mp4a.40.2", muxerCodec: "aac", label: "AAC" },
+	{ encoderCodec: "opus", muxerCodec: "opus", label: "Opus" },
+];
+
 export class AudioProcessor {
 	private cancelled = false;
 
+	static async selectSupportedExportCodec(
+		sampleRate: number,
+		numberOfChannels: number,
+	): Promise<ExportAudioCodec | null> {
+		for (const codec of EXPORT_AUDIO_CODECS) {
+			const support = await AudioEncoder.isConfigSupported({
+				codec: codec.encoderCodec,
+				sampleRate,
+				numberOfChannels,
+				bitrate: AUDIO_BITRATE,
+			});
+			if (support.supported) {
+				return codec;
+			}
+		}
+
+		return null;
+	}
+
+	static async selectSupportedExportCodecForSource(
+		demuxer: WebDemuxer,
+	): Promise<ExportAudioCodec | null> {
+		let audioConfig: AudioDecoderConfig;
+		try {
+			audioConfig = await demuxer.getDecoderConfig("audio");
+		} catch {
+			return null;
+		}
+
+		const codecCheck = await AudioDecoder.isConfigSupported(audioConfig);
+		if (!codecCheck.supported) {
+			console.warn("[AudioProcessor] Audio codec not supported:", audioConfig.codec);
+			return null;
+		}
+
+		const sampleRate = audioConfig.sampleRate || 48000;
+		const channels = audioConfig.numberOfChannels || 2;
+		return AudioProcessor.selectSupportedExportCodec(sampleRate, channels);
+	}
+
 	/**
 	 * Audio export has two modes:
 	 * 1) no speed regions -> fast WebCodecs trim-only pipeline
@@ -23,6 +73,7 @@ export class AudioProcessor {
 		trimRegions: TrimRegion[] | undefined,
 		speedRegions: SpeedRegion[] | undefined,
 		validatedDurationSec: number,
+		exportCodec: ExportAudioCodec,
 	): Promise<void> {
 		const sortedTrims = trimRegions ? [...trimRegions].sort((a, b) => a.startMs - b.startMs) : [];
 		const sortedSpeedRegions = speedRegions
@@ -40,7 +91,7 @@ export class AudioProcessor {
 				validatedDurationSec,
 			);
 			if (!this.cancelled && renderedAudioBlob.size > 0) {
-				await this.muxRenderedAudioBlob(renderedAudioBlob, muxer);
+				await this.muxRenderedAudioBlob(renderedAudioBlob, muxer, exportCodec);
 				return;
 			}
 			return;
@@ -50,7 +101,7 @@ export class AudioProcessor {
 		// The +0.5s buffer mirrors streamingDecoder.decodeAll's read window so the trim-only
 		// and speed-aware paths agree on how far to read past the validated duration boundary.
 		const readEndSec = validatedDurationSec + 0.5;
-		await this.processTrimOnlyAudio(demuxer, muxer, sortedTrims, readEndSec);
+		await this.processTrimOnlyAudio(demuxer, muxer, sortedTrims, readEndSec, exportCodec);
 	}
 
 	// Legacy trim-only path. This is still used for projects without speed regions.
@@ -59,6 +110,7 @@ export class AudioProcessor {
 		muxer: VideoMuxer,
 		sortedTrims: TrimRegion[],
 		readEndSec?: number,
+		exportCodec?: ExportAudioCodec,
 	): Promise<void> {
 		let audioConfig: AudioDecoderConfig;
 		try {
@@ -137,9 +189,16 @@ export class AudioProcessor {
 
 		const sampleRate = audioConfig.sampleRate || 48000;
 		const channels = audioConfig.numberOfChannels || 2;
+		const selectedCodec =
+			exportCodec ?? (await AudioProcessor.selectSupportedExportCodec(sampleRate, channels));
+		if (!selectedCodec) {
+			console.warn("[AudioProcessor] No supported audio export codec, skipping audio");
+			for (const frame of decodedFrames) frame.close();
+			return;
+		}
 
 		const encodeConfig: AudioEncoderConfig = {
-			codec: EXPORT_AUDIO_CODEC,
+			codec: selectedCodec.encoderCodec,
 			sampleRate,
 			numberOfChannels: channels,
 			bitrate: AUDIO_BITRATE,
@@ -147,7 +206,9 @@ export class AudioProcessor {
 
 		const encodeSupport = await AudioEncoder.isConfigSupported(encodeConfig);
 		if (!encodeSupport.supported) {
-			console.warn("[AudioProcessor] AAC encoding not supported, skipping audio");
+			console.warn(
+				`[AudioProcessor] ${selectedCodec.label} encoding not supported, skipping audio`,
+			);
 			for (const frame of decodedFrames) frame.close();
 			return;
 		}
@@ -389,7 +450,11 @@ export class AudioProcessor {
 	}
 
 	// Demuxes the rendered speed-adjusted blob and feeds encoded chunks into the MP4 muxer.
-	private async muxRenderedAudioBlob(blob: Blob, muxer: VideoMuxer): Promise<void> {
+	private async muxRenderedAudioBlob(
+		blob: Blob,
+		muxer: VideoMuxer,
+		exportCodec: ExportAudioCodec,
+	): Promise<void> {
 		if (this.cancelled) return;
 
 		const file = new File([blob], "speed-audio.webm", { type: blob.type || "audio/webm" });
@@ -398,7 +463,7 @@ export class AudioProcessor {
 
 		try {
 			await demuxer.load(file);
-			await this.processTrimOnlyAudio(demuxer, muxer, []);
+			await this.processTrimOnlyAudio(demuxer, muxer, [], undefined, exportCodec);
 		} finally {
 			try {
 				demuxer.destroy();
diff --git a/src/lib/exporter/muxer.ts b/src/lib/exporter/muxer.ts
index a2cc76d96..95d41ad2e 100644
--- a/src/lib/exporter/muxer.ts
+++ b/src/lib/exporter/muxer.ts
@@ -8,6 +8,8 @@ import {
 } from "mediabunny";
 import type { ExportConfig } from "./types";
 
+export type ExportAudioMuxerCodec = "aac" | "opus";
+
 export class VideoMuxer {
 	private output: Output | null = null;
 	private videoSource: EncodedVideoPacketSource | null = null;
@@ -15,10 +17,12 @@ export class VideoMuxer {
 	private hasAudio: boolean;
 	private target: BufferTarget | null = null;
 	private config: ExportConfig;
+	private audioCodec: ExportAudioMuxerCodec;
 
-	constructor(config: ExportConfig, hasAudio = false) {
+	constructor(config: ExportConfig, hasAudio = false, audioCodec: ExportAudioMuxerCodec = "aac") {
 		this.config = config;
 		this.hasAudio = hasAudio;
+		this.audioCodec = audioCodec;
 	}
 
 	async initialize(): Promise<void> {
@@ -40,7 +44,7 @@ export class VideoMuxer {
 
 		// Create audio source if needed
 		if (this.hasAudio) {
-			this.audioSource = new EncodedAudioPacketSource("aac");
+			this.audioSource = new EncodedAudioPacketSource(this.audioCodec);
 			this.output.addAudioTrack(this.audioSource);
 		}
 
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index 19cd5a0ee..8da602b6e 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -178,8 +178,17 @@ export class VideoExporter {
 
 			await this.initializeEncoder(encoderPreference);
 
-			const hasAudio = videoInfo.hasAudio;
-			const muxer = new VideoMuxer(this.config, hasAudio);
+			const sourceDemuxer = streamingDecoder.getDemuxer();
+			const audioExportCodec =
+				videoInfo.hasAudio && sourceDemuxer
+					? await AudioProcessor.selectSupportedExportCodecForSource(sourceDemuxer)
+					: null;
+			if (videoInfo.hasAudio && !audioExportCodec) {
+				console.warn("[VideoExporter] No supported audio export codec, exporting video-only.");
+			}
+
+			const hasAudio = Boolean(audioExportCodec);
+			const muxer = new VideoMuxer(this.config, hasAudio, audioExportCodec?.muxerCodec);
 			this.muxer = muxer;
 			await muxer.initialize();
 
@@ -361,7 +370,7 @@ export class VideoExporter {
 				phase: "finalizing",
 			});
 
-			if (hasAudio && !this.cancelled) {
+			if (hasAudio && audioExportCodec && !this.cancelled) {
 				const demuxer = streamingDecoder.getDemuxer();
 				if (demuxer) {
 					console.log("[VideoExporter] Processing audio track...");
@@ -373,6 +382,7 @@ export class VideoExporter {
 						this.config.trimRegions,
 						this.config.speedRegions,
 						videoInfo.duration,
+						audioExportCodec,
 					);
 				}
 			}

From 6e8932ab994b7e573f11945eb1e860a6075b0318 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 14:28:39 +0200
Subject: [PATCH 33/38] fix: restore source copy export fast path

---
 src/lib/exporter/videoExporter.test.ts | 117 +++++++++++++++++++++
 src/lib/exporter/videoExporter.ts      | 135 ++++++++++++++++++++++++-
 2 files changed, 251 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/exporter/videoExporter.test.ts

diff --git a/src/lib/exporter/videoExporter.test.ts b/src/lib/exporter/videoExporter.test.ts
new file mode 100644
index 000000000..9eddb87c4
--- /dev/null
+++ b/src/lib/exporter/videoExporter.test.ts
@@ -0,0 +1,117 @@
+import { describe, expect, it } from "vitest";
+import { isSourceCopyFastPathEligible, type VideoExporterConfig } from "./videoExporter";
+
+function createConfig(overrides: Partial<VideoExporterConfig> = {}): VideoExporterConfig {
+	return {
+		videoUrl: "recording.mp4",
+		width: 1920,
+		height: 1080,
+		frameRate: 60,
+		bitrate: 30_000_000,
+		wallpaper: "#000000",
+		zoomRegions: [],
+		trimRegions: [],
+		speedRegions: [],
+		showShadow: false,
+		shadowIntensity: 0,
+		showBlur: false,
+		cropRegion: { x: 0, y: 0, width: 1, height: 1 },
+		...overrides,
+	};
+}
+
+describe("isSourceCopyFastPathEligible", () => {
+	it("allows a no-op MP4 export at source dimensions", () => {
+		expect(
+			isSourceCopyFastPathEligible(createConfig(), {
+				width: 1920,
+				height: 1080,
+			}),
+		).toBe(true);
+	});
+
+	it("rejects timeline edits and frame-level effects", () => {
+		const videoInfo = { width: 1920, height: 1080 };
+
+		expect(
+			isSourceCopyFastPathEligible(
+				createConfig({ trimRegions: [{ id: "trim", startMs: 100, endMs: 200 }] }),
+				videoInfo,
+			),
+		).toBe(false);
+		expect(
+			isSourceCopyFastPathEligible(
+				createConfig({
+					speedRegions: [{ id: "speed", startMs: 100, endMs: 200, speed: 1.5 }],
+				}),
+				videoInfo,
+			),
+		).toBe(false);
+		expect(
+			isSourceCopyFastPathEligible(
+				createConfig({
+					zoomRegions: [
+						{
+							id: "zoom",
+							startMs: 100,
+							endMs: 200,
+							depth: 2,
+							focus: { cx: 0.5, cy: 0.5 },
+						},
+					],
+				}),
+				videoInfo,
+			),
+		).toBe(false);
+		expect(isSourceCopyFastPathEligible(createConfig({ showBlur: true }), videoInfo)).toBe(false);
+	});
+
+	it("rejects resizing and overlays", () => {
+		const videoInfo = { width: 1920, height: 1080 };
+
+		expect(isSourceCopyFastPathEligible(createConfig({ width: 1280 }), videoInfo)).toBe(false);
+		expect(
+			isSourceCopyFastPathEligible(
+				createConfig({
+					cursorScale: 2,
+					cursorRecordingData: {
+						version: 2,
+						provider: "native",
+						assets: [
+							{
+								id: "cursor",
+								platform: "win32",
+								imageDataUrl: "data:image/png;base64,AA==",
+								width: 32,
+								height: 32,
+								hotspotX: 0,
+								hotspotY: 0,
+							},
+						],
+						samples: [{ timeMs: 0, cx: 0.5, cy: 0.5, visible: true, assetId: "cursor" }],
+					},
+				}),
+				videoInfo,
+			),
+		).toBe(false);
+		expect(
+			isSourceCopyFastPathEligible(
+				createConfig({
+					cursorHighlight: {
+						enabled: true,
+						style: "ring",
+						sizePx: 24,
+						color: "#ffffff",
+						opacity: 1,
+						onlyOnClicks: false,
+						clickEmphasisDurationMs: 350,
+						offsetXNorm: 0,
+						offsetYNorm: 0,
+					},
+					cursorTelemetry: [{ timeMs: 0, cx: 0.5, cy: 0.5 }],
+				}),
+				videoInfo,
+			),
+		).toBe(false);
+	});
+});
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index 8da602b6e..d84e95fff 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -20,7 +20,7 @@ import type { ExportConfig, ExportProgress, ExportResult } from "./types";
 const ENCODER_STALL_TIMEOUT_MS = 15_000;
 const ENCODER_FLUSH_TIMEOUT_MS = 20_000;
 
-interface VideoExporterConfig extends ExportConfig {
+export interface VideoExporterConfig extends ExportConfig {
 	videoUrl: string;
 	webcamVideoUrl?: string;
 	wallpaper: string;
@@ -53,6 +53,84 @@ interface VideoExporterConfig extends ExportConfig {
 	onProgress?: (progress: ExportProgress) => void;
 }
 
+const SOURCE_COPY_EPSILON = 0.0001;
+
+function hasActiveTimeRegions(regions?: Array<{ startMs: number; endMs: number }>) {
+	return Boolean(regions?.some((region) => region.endMs - region.startMs > SOURCE_COPY_EPSILON));
+}
+
+function hasActiveSpeedRegions(regions?: SpeedRegion[]) {
+	return Boolean(
+		regions?.some(
+			(region) =>
+				region.endMs - region.startMs > SOURCE_COPY_EPSILON &&
+				Math.abs(region.speed - 1) > SOURCE_COPY_EPSILON,
+		),
+	);
+}
+
+function hasNativeCursorOverlay(config: VideoExporterConfig) {
+	return Boolean(
+		(config.cursorScale ?? 0) > 0 &&
+			config.cursorRecordingData?.provider === "native" &&
+			config.cursorRecordingData.samples.length > 0 &&
+			config.cursorRecordingData.assets.length > 0,
+	);
+}
+
+function hasCursorHighlightOverlay(config: VideoExporterConfig) {
+	return Boolean(
+		config.cursorHighlight?.enabled && config.cursorTelemetry && config.cursorTelemetry.length > 0,
+	);
+}
+
+function isDefaultCrop(cropRegion: CropRegion) {
+	return (
+		Math.abs(cropRegion.x) <= SOURCE_COPY_EPSILON &&
+		Math.abs(cropRegion.y) <= SOURCE_COPY_EPSILON &&
+		Math.abs(cropRegion.width - 1) <= SOURCE_COPY_EPSILON &&
+		Math.abs(cropRegion.height - 1) <= SOURCE_COPY_EPSILON
+	);
+}
+
+export function isSourceCopyFastPathEligible(
+	config: VideoExporterConfig,
+	videoInfo: { width: number; height: number },
+) {
+	return (
+		config.width === videoInfo.width &&
+		config.height === videoInfo.height &&
+		!config.webcamVideoUrl &&
+		!hasActiveTimeRegions(config.trimRegions) &&
+		!hasActiveSpeedRegions(config.speedRegions) &&
+		!hasActiveTimeRegions(config.zoomRegions) &&
+		!hasActiveTimeRegions(config.annotationRegions) &&
+		!hasNativeCursorOverlay(config) &&
+		!hasCursorHighlightOverlay(config) &&
+		isDefaultCrop(config.cropRegion) &&
+		(config.padding ?? 0) <= SOURCE_COPY_EPSILON &&
+		(config.videoPadding ?? 0) <= SOURCE_COPY_EPSILON &&
+		(config.borderRadius ?? 0) <= SOURCE_COPY_EPSILON &&
+		!config.showShadow &&
+		config.shadowIntensity <= SOURCE_COPY_EPSILON &&
+		!config.showBlur &&
+		(config.motionBlurAmount ?? 0) <= SOURCE_COPY_EPSILON
+	);
+}
+
+function isMp4Source(videoUrl: string, blob: Blob) {
+	if (blob.type.toLowerCase().includes("mp4")) {
+		return true;
+	}
+
+	try {
+		const path = new URL(videoUrl, window.location.href).pathname;
+		return path.toLowerCase().endsWith(".mp4");
+	} catch {
+		return videoUrl.toLowerCase().split(/[?#]/, 1)[0].endsWith(".mp4");
+	}
+}
+
 export class VideoExporter {
 	private config: VideoExporterConfig;
 	private streamingDecoder: StreamingVideoDecoder | null = null;
@@ -133,6 +211,11 @@ export class VideoExporter {
 			const streamingDecoder = new StreamingVideoDecoder();
 			this.streamingDecoder = streamingDecoder;
 			const videoInfo = await streamingDecoder.loadMetadata(this.config.videoUrl);
+			const sourceCopyResult = await this.trySourceCopyFastPath(videoInfo);
+			if (sourceCopyResult) {
+				return sourceCopyResult;
+			}
+
 			let webcamInfo: Awaited<ReturnType<StreamingVideoDecoder["loadMetadata"]>> | null = null;
 			if (this.config.webcamVideoUrl) {
 				webcamDecoder = new StreamingVideoDecoder();
@@ -566,6 +649,56 @@ export class VideoExporter {
 		return ["prefer-hardware", "prefer-software"];
 	}
 
+	private async trySourceCopyFastPath(videoInfo: { width: number; height: number }) {
+		if (!isSourceCopyFastPathEligible(this.config, videoInfo)) {
+			return null;
+		}
+
+		const sourceBlob = await this.loadSourceBlob();
+		if (!sourceBlob || !isMp4Source(this.config.videoUrl, sourceBlob)) {
+			return null;
+		}
+
+		if (this.cancelled) {
+			return { success: false, error: "Export cancelled" };
+		}
+
+		this.reportProgress({
+			currentFrame: 1,
+			totalFrames: 1,
+			percentage: 100,
+			estimatedTimeRemaining: 0,
+			phase: "finalizing",
+		});
+
+		return {
+			success: true,
+			blob: sourceBlob.type ? sourceBlob : new Blob([sourceBlob], { type: "video/mp4" }),
+		} satisfies ExportResult;
+	}
+
+	private async loadSourceBlob() {
+		const videoUrl = this.config.videoUrl;
+		const isRemoteUrl = /^(https?:|blob:|data:)/i.test(videoUrl);
+
+		if (!isRemoteUrl && window.electronAPI?.readBinaryFile) {
+			const result = await window.electronAPI.readBinaryFile(videoUrl);
+			if (!result.success || !result.data) {
+				return null;
+			}
+
+			const type = videoUrl.toLowerCase().split(/[?#]/, 1)[0].endsWith(".mp4") ? "video/mp4" : "";
+			return new Blob([result.data], type ? { type } : undefined);
+		}
+
+		const response = await fetch(videoUrl);
+		if (!response.ok) {
+			return null;
+		}
+
+		return response.blob();
+	}
+
 	private reportProgress(progress: ExportProgress): void {
 		this.config.onProgress?.(progress);
 	}

From fbcbf8f6d133cb8e2929803309c3b91cee729799 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 14:32:02 +0200
Subject: [PATCH 34/38] fix: guard source copy while native cursor data loads

---
 src/components/video-editor/VideoEditor.tsx |  9 +++++++--
 src/lib/exporter/videoExporter.test.ts      |  9 +++++++++
 src/lib/exporter/videoExporter.ts           | 12 ++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 376b52ef7..8fc66f828 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -163,8 +163,11 @@ export default function VideoEditor() {
 	const cursorTelemetrySourcePath = videoSourcePath ?? (videoPath ? fromFileUrl(videoPath) : null);
 	const { samples: cursorTelemetry, error: cursorTelemetryError } =
 		useCursorTelemetry(cursorTelemetrySourcePath);
-	const { data: cursorRecordingData, error: cursorRecordingDataError } =
-		useCursorRecordingData(cursorTelemetrySourcePath);
+	const {
+		data: cursorRecordingData,
+		loading: cursorRecordingDataLoading,
+		error: cursorRecordingDataError,
+	} = useCursorRecordingData(cursorTelemetrySourcePath);
 	const cursorClickTimestamps = useMemo<number[]>(() => {
 		const recordingClicks =
 			cursorRecordingData?.samples
@@ -1605,6 +1608,7 @@ export default function VideoEditor() {
 						padding,
 						cropRegion,
 						cursorRecordingData,
+						cursorRecordingDataLoading,
 						cursorScale: showCursor ? cursorSize : 0,
 						cursorSmoothing,
 						cursorMotionBlur,
@@ -1693,6 +1697,7 @@ export default function VideoEditor() {
 			padding,
 			cropRegion,
 			cursorRecordingData,
+			cursorRecordingDataLoading,
 			annotationRegions,
 			isPlaying,
 			aspectRatio,
diff --git a/src/lib/exporter/videoExporter.test.ts b/src/lib/exporter/videoExporter.test.ts
index 9eddb87c4..b90ff3916 100644
--- a/src/lib/exporter/videoExporter.test.ts
+++ b/src/lib/exporter/videoExporter.test.ts
@@ -70,6 +70,15 @@ describe("isSourceCopyFastPathEligible", () => {
 		const videoInfo = { width: 1920, height: 1080 };
 
 		expect(isSourceCopyFastPathEligible(createConfig({ width: 1280 }), videoInfo)).toBe(false);
+		expect(
+			isSourceCopyFastPathEligible(
+				createConfig({
+					cursorRecordingDataLoading: true,
+					cursorScale: 2,
+				}),
+				videoInfo,
+			),
+		).toBe(false);
 		expect(
 			isSourceCopyFastPathEligible(
 				createConfig({
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index d84e95fff..231548d6e 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -40,6 +40,7 @@ export interface VideoExporterConfig extends ExportConfig {
 	webcamSizePreset?: WebcamSizePreset;
 	webcamPosition?: { cx: number; cy: number } | null;
 	cursorRecordingData?: CursorRecordingData | null;
+	cursorRecordingDataLoading?: boolean;
 	cursorScale?: number;
 	cursorSmoothing?: number;
 	cursorMotionBlur?: number;
@@ -70,9 +71,16 @@ function hasActiveSpeedRegions(regions?: SpeedRegion[]) {
 }
 
 function hasNativeCursorOverlay(config: VideoExporterConfig) {
+	if ((config.cursorScale ?? 0) <= 0) {
+		return false;
+	}
+
+	if (config.cursorRecordingDataLoading) {
+		return true;
+	}
+
 	return Boolean(
-		(config.cursorScale ?? 0) > 0 &&
-			config.cursorRecordingData?.provider === "native" &&
+		config.cursorRecordingData?.provider === "native" &&
 			config.cursorRecordingData.samples.length > 0 &&
 			config.cursorRecordingData.assets.length > 0,
 	);

From f802395a94c40e2dffb97f03dd3479c0d340a2f2 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 14:50:46 +0200
Subject: [PATCH 35/38] fix: preserve cursor and audio in exports

---
 src/components/video-editor/VideoEditor.tsx |  9 ++-------
 src/lib/exporter/audioEncoder.ts            |  2 +-
 src/lib/exporter/videoExporter.test.ts      |  1 -
 src/lib/exporter/videoExporter.ts           | 15 +--------------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 8fc66f828..376b52ef7 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -163,11 +163,8 @@ export default function VideoEditor() {
 	const cursorTelemetrySourcePath = videoSourcePath ?? (videoPath ? fromFileUrl(videoPath) : null);
 	const { samples: cursorTelemetry, error: cursorTelemetryError } =
 		useCursorTelemetry(cursorTelemetrySourcePath);
-	const {
-		data: cursorRecordingData,
-		loading: cursorRecordingDataLoading,
-		error: cursorRecordingDataError,
-	} = useCursorRecordingData(cursorTelemetrySourcePath);
+	const { data: cursorRecordingData, error: cursorRecordingDataError } =
+		useCursorRecordingData(cursorTelemetrySourcePath);
 	const cursorClickTimestamps = useMemo<number[]>(() => {
 		const recordingClicks =
 			cursorRecordingData?.samples
@@ -1608,7 +1605,6 @@ export default function VideoEditor() {
 						padding,
 						cropRegion,
 						cursorRecordingData,
-						cursorRecordingDataLoading,
 						cursorScale: showCursor ? cursorSize : 0,
 						cursorSmoothing,
 						cursorMotionBlur,
@@ -1697,7 +1693,6 @@ export default function VideoEditor() {
 			padding,
 			cropRegion,
 			cursorRecordingData,
-			cursorRecordingDataLoading,
 			annotationRegions,
 			isPlaying,
 			aspectRatio,
diff --git a/src/lib/exporter/audioEncoder.ts b/src/lib/exporter/audioEncoder.ts
index 870fdc389..18dac6226 100644
--- a/src/lib/exporter/audioEncoder.ts
+++ b/src/lib/exporter/audioEncoder.ts
@@ -14,8 +14,8 @@ export interface ExportAudioCodec {
 }
 
 const EXPORT_AUDIO_CODECS: ExportAudioCodec[] = [
-	{ encoderCodec: "mp4a.40.2", muxerCodec: "aac", label: "AAC" },
 	{ encoderCodec: "opus", muxerCodec: "opus", label: "Opus" },
+	{ encoderCodec: "mp4a.40.2", muxerCodec: "aac", label: "AAC" },
 ];
 
 export class AudioProcessor {
diff --git a/src/lib/exporter/videoExporter.test.ts b/src/lib/exporter/videoExporter.test.ts
index b90ff3916..3f14ec16c 100644
--- a/src/lib/exporter/videoExporter.test.ts
+++ b/src/lib/exporter/videoExporter.test.ts
@@ -73,7 +73,6 @@ describe("isSourceCopyFastPathEligible", () => {
 		expect(
 			isSourceCopyFastPathEligible(
 				createConfig({
-					cursorRecordingDataLoading: true,
 					cursorScale: 2,
 				}),
 				videoInfo,
diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.ts
index 231548d6e..973e6befa 100644
--- a/src/lib/exporter/videoExporter.ts
+++ b/src/lib/exporter/videoExporter.ts
@@ -40,7 +40,6 @@ export interface VideoExporterConfig extends ExportConfig {
 	webcamSizePreset?: WebcamSizePreset;
 	webcamPosition?: { cx: number; cy: number } | null;
 	cursorRecordingData?: CursorRecordingData | null;
-	cursorRecordingDataLoading?: boolean;
 	cursorScale?: number;
 	cursorSmoothing?: number;
 	cursorMotionBlur?: number;
@@ -71,19 +70,7 @@ function hasActiveSpeedRegions(regions?: SpeedRegion[]) {
 }
 
 function hasNativeCursorOverlay(config: VideoExporterConfig) {
-	if ((config.cursorScale ?? 0) <= 0) {
-		return false;
-	}
-
-	if (config.cursorRecordingDataLoading) {
-		return true;
-	}
-
-	return Boolean(
-		config.cursorRecordingData?.provider === "native" &&
-			config.cursorRecordingData.samples.length > 0 &&
-			config.cursorRecordingData.assets.length > 0,
-	);
+	return (config.cursorScale ?? 0) > 0;
 }
 
 function hasCursorHighlightOverlay(config: VideoExporterConfig) {

From 3d79a0920405e366616485fbfa8c0075bf0030e5 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 14:58:37 +0200
Subject: [PATCH 36/38] fix: downmix multichannel export audio

---
 src/lib/exporter/audioEncoder.test.ts |  40 ++++++++++
 src/lib/exporter/audioEncoder.ts      | 110 ++++++++++++++++++++++----
 2 files changed, 133 insertions(+), 17 deletions(-)
 create mode 100644 src/lib/exporter/audioEncoder.test.ts

diff --git a/src/lib/exporter/audioEncoder.test.ts b/src/lib/exporter/audioEncoder.test.ts
new file mode 100644
index 000000000..5d66989ab
--- /dev/null
+++ b/src/lib/exporter/audioEncoder.test.ts
@@ -0,0 +1,40 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { AudioProcessor } from "./audioEncoder";
+
+describe("AudioProcessor.selectSupportedExportCodec", () => {
+	afterEach(() => {
+		vi.unstubAllGlobals();
+	});
+
+	it("falls back to stereo when the source channel count cannot be encoded", async () => {
+		const isConfigSupported = vi.fn(async (config: AudioEncoderConfig) => ({
+			config,
+			supported:
+				config.codec === "mp4a.40.2" &&
+				config.sampleRate === 44100 &&
+				config.numberOfChannels === 2,
+		}));
+		vi.stubGlobal("AudioEncoder", { isConfigSupported });
+
+		const codec = await AudioProcessor.selectSupportedExportCodec(44100, 8);
+
+		expect(codec).toMatchObject({
+			encoderCodec: "mp4a.40.2",
+			muxerCodec: "aac",
+			sampleRate: 44100,
+			numberOfChannels: 2,
+		});
+		expect(isConfigSupported).toHaveBeenCalledWith({
+			codec: "mp4a.40.2",
+			sampleRate: 44100,
+			numberOfChannels: 8,
+			bitrate: 128000,
+		});
+		expect(isConfigSupported).toHaveBeenCalledWith({
+			codec: "mp4a.40.2",
+			sampleRate: 44100,
+			numberOfChannels: 2,
+			bitrate: 128000,
+		});
+	});
+});
diff --git a/src/lib/exporter/audioEncoder.ts b/src/lib/exporter/audioEncoder.ts
index 18dac6226..0d6a62275 100644
--- a/src/lib/exporter/audioEncoder.ts
+++ b/src/lib/exporter/audioEncoder.ts
@@ -11,11 +11,15 @@ export interface ExportAudioCodec {
 	encoderCodec: string;
 	muxerCodec: ExportAudioMuxerCodec;
 	label: string;
+	sampleRate: number;
+	numberOfChannels: number;
 }
 
-const EXPORT_AUDIO_CODECS: ExportAudioCodec[] = [
-	{ encoderCodec: "opus", muxerCodec: "opus", label: "Opus" },
+type ExportAudioCodecCandidate = Omit<ExportAudioCodec, "sampleRate" | "numberOfChannels">;
+
+const EXPORT_AUDIO_CODECS: ExportAudioCodecCandidate[] = [
 	{ encoderCodec: "mp4a.40.2", muxerCodec: "aac", label: "AAC" },
+	{ encoderCodec: "opus", muxerCodec: "opus", label: "Opus" },
 ];
 
 export class AudioProcessor {
@@ -25,15 +29,26 @@ export class AudioProcessor {
 		sampleRate: number,
 		numberOfChannels: number,
 	): Promise<ExportAudioCodec | null> {
+		const channelOptions = [numberOfChannels];
+		if (numberOfChannels > 2) {
+			channelOptions.push(2);
+		}
+
+		if (!channelOptions.includes(1)) {
+			channelOptions.push(1);
+		}
+
 		for (const codec of EXPORT_AUDIO_CODECS) {
-			const support = await AudioEncoder.isConfigSupported({
-				codec: codec.encoderCodec,
-				sampleRate,
-				numberOfChannels,
-				bitrate: AUDIO_BITRATE,
-			});
-			if (support.supported) {
-				return codec;
+			for (const channels of channelOptions) {
+				const support = await AudioEncoder.isConfigSupported({
+					codec: codec.encoderCodec,
+					sampleRate,
+					numberOfChannels: channels,
+					bitrate: AUDIO_BITRATE,
+				});
+				if (support.supported) {
+					return { ...codec, sampleRate, numberOfChannels: channels };
+				}
 			}
 		}
 
@@ -56,9 +71,10 @@ export class AudioProcessor {
 			return null;
 		}
 
-		const sampleRate = audioConfig.sampleRate || 48000;
-		const channels = audioConfig.numberOfChannels || 2;
-		return AudioProcessor.selectSupportedExportCodec(sampleRate, channels);
+		return AudioProcessor.selectSupportedExportCodec(
+			audioConfig.sampleRate || 48000,
+			audioConfig.numberOfChannels || 2,
+		);
 	}
 
 	/**
@@ -197,10 +213,12 @@ export class AudioProcessor {
 			return;
 		}
 
+		const outputSampleRate = selectedCodec.sampleRate || sampleRate;
+		const outputChannels = selectedCodec.numberOfChannels || channels;
 		const encodeConfig: AudioEncoderConfig = {
 			codec: selectedCodec.encoderCodec,
-			sampleRate,
-			numberOfChannels: channels,
+			sampleRate: outputSampleRate,
+			numberOfChannels: outputChannels,
 			bitrate: AUDIO_BITRATE,
 		};
 
@@ -225,7 +243,11 @@ export class AudioProcessor {
 			const trimOffsetMs = this.computeTrimOffset(timestampMs, sortedTrims);
 			const adjustedTimestampUs = audioData.timestamp - trimOffsetMs * 1000;
 
-			const adjusted = this.cloneWithTimestamp(audioData, Math.max(0, adjustedTimestampUs));
+			const adjusted = this.cloneForEncoding(
+				audioData,
+				Math.max(0, adjustedTimestampUs),
+				outputChannels,
+			);
 			audioData.close();
 
 			encoder.encode(adjusted);
@@ -586,7 +608,15 @@ export class AudioProcessor {
 		);
 	}
 
-	private cloneWithTimestamp(src: AudioData, newTimestamp: number): AudioData {
+	private cloneForEncoding(
+		src: AudioData,
+		newTimestamp: number,
+		targetChannels: number,
+	): AudioData {
+		if (targetChannels !== src.numberOfChannels) {
+			return this.downmixWithTimestamp(src, newTimestamp, targetChannels);
+		}
+
 		if (!src.format) {
 			throw new Error("AudioData format is required for cloning");
 		}
@@ -616,6 +646,52 @@ export class AudioProcessor {
 		});
 	}
 
+	private downmixWithTimestamp(
+		src: AudioData,
+		newTimestamp: number,
+		targetChannels: number,
+	): AudioData {
+		const sourceChannels = src.numberOfChannels;
+		const frameCount = src.numberOfFrames;
+		if (targetChannels < 1 || targetChannels > 2) {
+			throw new Error(`Unsupported target channel count: ${targetChannels}`);
+		}
+
+		const sourcePlanes = Array.from({ length: sourceChannels }, () => new Float32Array(frameCount));
+		for (let channel = 0; channel < sourceChannels; channel++) {
+			src.copyTo(sourcePlanes[channel], {
+				format: "f32-planar",
+				planeIndex: channel,
+			});
+		}
+
+		const output = new Float32Array(frameCount * targetChannels);
+		if (targetChannels === 1) {
+			for (let frame = 0; frame < frameCount; frame++) {
+				let mixed = 0;
+				for (let channel = 0; channel < sourceChannels; channel++) {
+					mixed += sourcePlanes[channel][frame];
+				}
+				output[frame] = mixed / sourceChannels;
+			}
+		} else if (sourceChannels === 1) {
+			output.set(sourcePlanes[0], 0);
+			output.set(sourcePlanes[0], frameCount);
+		} else {
+			output.set(sourcePlanes[0], 0);
+			output.set(sourcePlanes[1], frameCount);
+		}
+
+		return new AudioData({
+			format: "f32-planar",
+			sampleRate: src.sampleRate,
+			numberOfFrames: frameCount,
+			numberOfChannels: targetChannels,
+			timestamp: newTimestamp,
+			data: output,
+		});
+	}
+
 	private isInTrimRegion(timestampMs: number, trims: TrimRegion[]): boolean {
 		return trims.some((trim) => timestampMs >= trim.startMs && timestampMs < trim.endMs);
 	}

From 4420f5b3e11eead1ed58e21629a8fbaecdfcb8de Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 15:15:48 +0200
Subject: [PATCH 37/38] feat: add Windows cursor capture mode

---
 electron/electron-env.d.ts                    |  6 +-
 electron/ipc/handlers.ts                      | 87 ++++++++++++++-----
 electron/native/wgc-capture/src/main.cpp      |  6 +-
 .../native/wgc-capture/src/wgc_session.cpp    | 42 ++++-----
 electron/native/wgc-capture/src/wgc_session.h |  5 +-
 electron/preload.ts                           |  8 +-
 src/components/launch/LaunchWindow.tsx        | 52 +++++++++++
 src/components/video-editor/VideoEditor.tsx   | 64 +++++++++-----
 src/hooks/useScreenRecorder.ts                | 21 +++--
 src/i18n/locales/en/launch.json               |  4 +
 src/i18n/locales/es/launch.json               |  4 +
 src/i18n/locales/fr/launch.json               |  4 +
 src/i18n/locales/ja-JP/launch.json            |  4 +
 src/i18n/locales/ko-KR/launch.json            |  4 +
 src/i18n/locales/tr/launch.json               |  4 +
 src/i18n/locales/zh-CN/launch.json            |  4 +
 src/i18n/locales/zh-TW/launch.json            |  4 +
 src/lib/nativeWindowsRecording.ts             |  3 +
 src/lib/recordingSession.ts                   | 19 ++--
 19 files changed, 259 insertions(+), 86 deletions(-)

diff --git a/electron/electron-env.d.ts b/electron/electron-env.d.ts
index b637fa3d0..8810fc67d 100644
--- a/electron/electron-env.d.ts
+++ b/electron/electron-env.d.ts
@@ -71,7 +71,11 @@ interface Window {
 			message?: string;
 			error?: string;
 		}>;
-		setRecordingState: (recording: boolean, recordingId?: number) => Promise<void>;
+		setRecordingState: (
+			recording: boolean,
+			recordingId?: number,
+			cursorCaptureMode?: import("../src/lib/recordingSession").CursorCaptureMode,
+		) => Promise<void>;
 		isNativeWindowsCaptureAvailable: () => Promise<{
 			success: boolean;
 			available: boolean;
diff --git a/electron/ipc/handlers.ts b/electron/ipc/handlers.ts
index e9f45672e..835d3b2fe 100644
--- a/electron/ipc/handlers.ts
+++ b/electron/ipc/handlers.ts
@@ -16,6 +16,8 @@ import {
 } from "electron";
 import type { NativeWindowsRecordingRequest } from "../../src/lib/nativeWindowsRecording";
 import {
+	type CursorCaptureMode,
+	normalizeCursorCaptureMode,
 	normalizeProjectMedia,
 	normalizeRecordingSession,
 	type ProjectMedia,
@@ -271,6 +273,7 @@ let nativeWindowsCaptureTargetPath: string | null = null;
 let nativeWindowsCaptureWebcamTargetPath: string | null = null;
 let nativeWindowsCaptureRecordingId: number | null = null;
 let nativeWindowsCursorOffsetMs = 0;
+let nativeWindowsCursorCaptureMode: CursorCaptureMode = "editable-overlay";
 const NATIVE_WINDOWS_CAPTURE_STOP_TIMEOUT_MS = 15_000;
 
 function normalizeCursorSample(sample: unknown): CursorRecordingSample | null {
@@ -1057,6 +1060,8 @@ export function registerIpcHandlers(
 				const webcamDirectShowClsid = request.webcam.enabled
 					? await resolveDirectShowWebcamClsid(request.webcam.deviceName)
 					: null;
+				const cursorCaptureMode =
+					normalizeCursorCaptureMode(request.cursor?.mode) ?? "editable-overlay";
 				const config = {
 					schemaVersion: 2,
 					recordingId,
@@ -1085,6 +1090,8 @@ export function registerIpcHandlers(
 					webcamWidth: request.webcam.width,
 					webcamHeight: request.webcam.height,
 					webcamFps: request.webcam.fps,
+					captureCursor: cursorCaptureMode === "system",
+					cursorCaptureMode,
 					outputs: {
 						screenPath: outputPath,
 						webcamPath: webcamOutputPath,
@@ -1099,6 +1106,9 @@ export function registerIpcHandlers(
 					video: request.video,
 					audio: request.audio,
 					webcam: request.webcam,
+					cursor: {
+						mode: cursorCaptureMode,
+					},
 				};
 
 				console.info("[native-wgc] starting Windows capture", {
@@ -1106,6 +1116,7 @@ export function registerIpcHandlers(
 					source: request.source,
 					audio: request.audio,
 					webcam: request.webcam,
+					cursor: { mode: cursorCaptureMode },
 					bounds,
 					sourceId: selectedSource?.id ?? null,
 					usedDisplayMatch: Boolean(sourceDisplay),
@@ -1118,13 +1129,18 @@ export function registerIpcHandlers(
 				nativeWindowsCaptureWebcamTargetPath = request.webcam.enabled ? webcamOutputPath : null;
 				nativeWindowsCaptureRecordingId = recordingId;
 				nativeWindowsCursorOffsetMs = 0;
+				nativeWindowsCursorCaptureMode = cursorCaptureMode;
 
 				const cursorStartTimeMs = Date.now();
-				await startCursorRecording(cursorStartTimeMs);
-				console.info("[native-wgc] cursor sampler ready", {
-					cursorStartTimeMs,
-					warmupMs: Date.now() - cursorStartTimeMs,
-				});
+				if (cursorCaptureMode === "editable-overlay") {
+					await startCursorRecording(cursorStartTimeMs);
+					console.info("[native-wgc] cursor sampler ready", {
+						cursorStartTimeMs,
+						warmupMs: Date.now() - cursorStartTimeMs,
+					});
+				} else {
+					pendingCursorRecordingData = null;
+				}
 
 				const proc = spawn(helperPath, [JSON.stringify(config)], {
 					cwd: RECORDINGS_DIR,
@@ -1135,7 +1151,10 @@ export function registerIpcHandlers(
 
 				await waitForNativeWindowsCaptureStart(proc);
 				const captureStartedAtMs = Date.now();
-				nativeWindowsCursorOffsetMs = Math.max(0, captureStartedAtMs - cursorStartTimeMs);
+				nativeWindowsCursorOffsetMs =
+					cursorCaptureMode === "editable-overlay"
+						? Math.max(0, captureStartedAtMs - cursorStartTimeMs)
+						: 0;
 				const webcamFormat = readNativeWindowsWebcamFormat(nativeWindowsCaptureOutput);
 				console.info("[native-wgc] capture started", {
 					captureStartedAtMs,
@@ -1162,6 +1181,7 @@ export function registerIpcHandlers(
 				nativeWindowsCaptureWebcamTargetPath = null;
 				nativeWindowsCaptureRecordingId = null;
 				nativeWindowsCursorOffsetMs = 0;
+				nativeWindowsCursorCaptureMode = "editable-overlay";
 				await stopCursorRecording();
 				return { success: false, error: String(error) };
 			}
@@ -1173,6 +1193,7 @@ export function registerIpcHandlers(
 		const preferredPath = nativeWindowsCaptureTargetPath;
 		const preferredWebcamPath = nativeWindowsCaptureWebcamTargetPath;
 		const recordingId = nativeWindowsCaptureRecordingId ?? Date.now();
+		const cursorCaptureMode = nativeWindowsCursorCaptureMode;
 
 		if (!proc) {
 			return { success: false, error: "Native Windows capture is not running." };
@@ -1187,7 +1208,11 @@ export function registerIpcHandlers(
 				throw new Error("Native Windows capture did not return an output path.");
 			}
 
-			await stopCursorRecording();
+			if (cursorCaptureMode === "editable-overlay") {
+				await stopCursorRecording();
+			} else {
+				pendingCursorRecordingData = null;
+			}
 			if (discard) {
 				pendingCursorRecordingData = null;
 				await Promise.all([
@@ -1198,8 +1223,10 @@ export function registerIpcHandlers(
 				return { success: true, discarded: true };
 			}
 
-			shiftPendingCursorTelemetry(nativeWindowsCursorOffsetMs);
-			await writePendingCursorTelemetry(screenVideoPath);
+			if (cursorCaptureMode === "editable-overlay") {
+				shiftPendingCursorTelemetry(nativeWindowsCursorOffsetMs);
+				await writePendingCursorTelemetry(screenVideoPath);
+			}
 			let webcamVideoPath: string | undefined;
 			if (preferredWebcamPath) {
 				try {
@@ -1210,8 +1237,8 @@ export function registerIpcHandlers(
 				}
 			}
 			const session: RecordingSession = webcamVideoPath
-				? { screenVideoPath, webcamVideoPath, createdAt: recordingId }
-				: { screenVideoPath, createdAt: recordingId };
+				? { screenVideoPath, webcamVideoPath, createdAt: recordingId, cursorCaptureMode }
+				: { screenVideoPath, createdAt: recordingId, cursorCaptureMode };
 			setCurrentRecordingSessionState(session);
 			currentProjectPath = null;
 
@@ -1237,6 +1264,7 @@ export function registerIpcHandlers(
 			nativeWindowsCaptureWebcamTargetPath = null;
 			nativeWindowsCaptureRecordingId = null;
 			nativeWindowsCursorOffsetMs = 0;
+			nativeWindowsCursorCaptureMode = "editable-overlay";
 			const source = selectedSource || { name: "Screen" };
 			if (onRecordingStateChange) {
 				onRecordingStateChange(false, source.name);
@@ -1262,6 +1290,7 @@ export function registerIpcHandlers(
 			typeof payload.createdAt === "number" && Number.isFinite(payload.createdAt)
 				? payload.createdAt
 				: Date.now();
+		const cursorCaptureMode = normalizeCursorCaptureMode(payload.cursorCaptureMode);
 		const screenVideoPath = resolveRecordingOutputPath(payload.screen.fileName);
 		await fs.writeFile(screenVideoPath, Buffer.from(payload.screen.videoData));
 
@@ -1272,8 +1301,13 @@ export function registerIpcHandlers(
 		}
 
 		const session: RecordingSession = webcamVideoPath
-			? { screenVideoPath, webcamVideoPath, createdAt }
-			: { screenVideoPath, createdAt };
+			? {
+					screenVideoPath,
+					webcamVideoPath,
+					createdAt,
+					...(cursorCaptureMode ? { cursorCaptureMode } : {}),
+				}
+			: { screenVideoPath, createdAt, ...(cursorCaptureMode ? { cursorCaptureMode } : {}) };
 		setCurrentRecordingSessionState(session);
 		currentProjectPath = null;
 
@@ -1334,18 +1368,23 @@ export function registerIpcHandlers(
 		}
 	});
 
-	ipcMain.handle("set-recording-state", async (_, recording: boolean, recordingId?: number) => {
-		if (recording) {
-			await startCursorRecording(recordingId);
-		} else {
-			await stopCursorRecording();
-		}
+	ipcMain.handle(
+		"set-recording-state",
+		async (_, recording: boolean, recordingId?: number, cursorCaptureMode?: CursorCaptureMode) => {
+			const normalizedCursorCaptureMode =
+				normalizeCursorCaptureMode(cursorCaptureMode) ?? "editable-overlay";
+			if (recording && normalizedCursorCaptureMode === "editable-overlay") {
+				await startCursorRecording(recordingId);
+			} else {
+				await stopCursorRecording();
+			}
 
-		const source = selectedSource || { name: "Screen" };
-		if (onRecordingStateChange) {
-			onRecordingStateChange(recording, source.name);
-		}
-	});
+			const source = selectedSource || { name: "Screen" };
+			if (onRecordingStateChange) {
+				onRecordingStateChange(recording, source.name);
+			}
+		},
+	);
 
 	ipcMain.handle("get-cursor-telemetry", async (_, videoPath?: string) => {
 		const targetVideoPath = resolveApprovedVideoPath(
diff --git a/electron/native/wgc-capture/src/main.cpp b/electron/native/wgc-capture/src/main.cpp
index 70aec1a9a..ad46837e4 100644
--- a/electron/native/wgc-capture/src/main.cpp
+++ b/electron/native/wgc-capture/src/main.cpp
@@ -36,6 +36,7 @@ struct CaptureConfig {
     bool hasDisplayBounds = false;
     bool captureSystemAudio = false;
     bool captureMic = false;
+    bool captureCursor = false;
     bool webcamEnabled = false;
     std::string microphoneDeviceId;
     std::string microphoneDeviceName;
@@ -302,6 +303,7 @@ bool parseConfig(const std::string& json, CaptureConfig& config) {
     config.hasDisplayBounds = findBool(json, "hasDisplayBounds", false);
     config.captureSystemAudio = findBool(json, "captureSystemAudio", false);
     config.captureMic = findBool(json, "captureMic", false);
+    config.captureCursor = findBool(json, "captureCursor", false);
     config.webcamEnabled = findBool(json, "webcamEnabled", false);
     config.microphoneDeviceId = findString(json, "microphoneDeviceId");
     config.microphoneDeviceName = findString(json, "microphoneDeviceName");
@@ -355,7 +357,7 @@ int main(int argc, char* argv[]) {
             std::cerr << "ERROR: Could not resolve monitor" << std::endl;
             return 1;
         }
-        if (!session.initialize(monitor, config.fps)) {
+        if (!session.initialize(monitor, config.fps, config.captureCursor)) {
             std::cerr << "ERROR: Failed to initialize WGC display session" << std::endl;
             return 1;
         }
@@ -365,7 +367,7 @@ int main(int argc, char* argv[]) {
             std::cerr << "ERROR: Native window capture requires a valid HWND" << std::endl;
             return 1;
         }
-        if (!session.initialize(window, config.fps)) {
+        if (!session.initialize(window, config.fps, config.captureCursor)) {
             std::cerr << "ERROR: Failed to initialize WGC window session" << std::endl;
             return 1;
         }
diff --git a/electron/native/wgc-capture/src/wgc_session.cpp b/electron/native/wgc-capture/src/wgc_session.cpp
index ab7e9e303..fbdc5a576 100644
--- a/electron/native/wgc-capture/src/wgc_session.cpp
+++ b/electron/native/wgc-capture/src/wgc_session.cpp
@@ -140,7 +140,21 @@ bool WgcSession::createCaptureItem(HWND window) {
     return width_ > 0 && height_ > 0;
 }
 
-bool WgcSession::initialize(HMONITOR monitor, int fps) {
+void WgcSession::applySessionOptions(bool captureCursor) {
+    try {
+        session_.IsCursorCaptureEnabled(captureCursor);
+    } catch (...) {
+        // Older WGC builds can omit this property. They will keep the OS default.
+    }
+
+    try {
+        session_.IsBorderRequired(false);
+    } catch (...) {
+        // IsBorderRequired is Windows 11-only. Ignore it on older builds.
+    }
+}
+
+bool WgcSession::initialize(HMONITOR monitor, int fps, bool captureCursor) {
     fps_ = fps > 0 ? fps : 60;
     if (!createD3DDevice()) {
         return false;
@@ -156,23 +170,13 @@ bool WgcSession::initialize(HMONITOR monitor, int fps) {
         item_.Size());
     session_ = framePool_.CreateCaptureSession(item_);
 
-    try {
-        session_.IsCursorCaptureEnabled(false);
-    } catch (...) {
-        // Older WGC builds can omit this property; callers still overlay their own cursor.
-    }
-
-    try {
-        session_.IsBorderRequired(false);
-    } catch (...) {
-        // IsBorderRequired is Windows 11-only. Ignore it on older builds.
-    }
+    applySessionOptions(captureCursor);
 
     frameArrivedToken_ = framePool_.FrameArrived({this, &WgcSession::onFrameArrived});
     return true;
 }
 
-bool WgcSession::initialize(HWND window, int fps) {
+bool WgcSession::initialize(HWND window, int fps, bool captureCursor) {
     fps_ = fps > 0 ? fps : 60;
     if (!createD3DDevice()) {
         return false;
@@ -188,17 +192,7 @@ bool WgcSession::initialize(HWND window, int fps) {
         item_.Size());
     session_ = framePool_.CreateCaptureSession(item_);
 
-    try {
-        session_.IsCursorCaptureEnabled(false);
-    } catch (...) {
-        // Older WGC builds can omit this property; callers still overlay their own cursor.
-    }
-
-    try {
-        session_.IsBorderRequired(false);
-    } catch (...) {
-        // IsBorderRequired is Windows 11-only. Ignore it on older builds.
-    }
+    applySessionOptions(captureCursor);
 
     frameArrivedToken_ = framePool_.FrameArrived({this, &WgcSession::onFrameArrived});
     return true;
diff --git a/electron/native/wgc-capture/src/wgc_session.h b/electron/native/wgc-capture/src/wgc_session.h
index 34ad3f50d..4b7a0c4b7 100644
--- a/electron/native/wgc-capture/src/wgc_session.h
+++ b/electron/native/wgc-capture/src/wgc_session.h
@@ -22,8 +22,8 @@ class WgcSession {
     WgcSession(const WgcSession&) = delete;
     WgcSession& operator=(const WgcSession&) = delete;
 
-    bool initialize(HMONITOR monitor, int fps);
-    bool initialize(HWND window, int fps);
+    bool initialize(HMONITOR monitor, int fps, bool captureCursor);
+    bool initialize(HWND window, int fps, bool captureCursor);
     void setFrameCallback(FrameCallback callback);
     bool start();
     void stop();
@@ -37,6 +37,7 @@ class WgcSession {
     bool createD3DDevice();
     bool createCaptureItem(HMONITOR monitor);
     bool createCaptureItem(HWND window);
+    void applySessionOptions(bool captureCursor);
     void onFrameArrived(
         winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const& sender,
         winrt::Windows::Foundation::IInspectable const&);
diff --git a/electron/preload.ts b/electron/preload.ts
index 6742a3a7f..74893809a 100644
--- a/electron/preload.ts
+++ b/electron/preload.ts
@@ -59,8 +59,12 @@ contextBridge.exposeInMainWorld("electronAPI", {
 	getRecordedVideoPath: () => {
 		return ipcRenderer.invoke("get-recorded-video-path");
 	},
-	setRecordingState: (recording: boolean, recordingId?: number) => {
-		return ipcRenderer.invoke("set-recording-state", recording, recordingId);
+	setRecordingState: (
+		recording: boolean,
+		recordingId?: number,
+		cursorCaptureMode?: import("../src/lib/recordingSession").CursorCaptureMode,
+	) => {
+		return ipcRenderer.invoke("set-recording-state", recording, recordingId, cursorCaptureMode);
 	},
 	isNativeWindowsCaptureAvailable: () => {
 		return ipcRenderer.invoke("is-native-windows-capture-available");
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 8fb22db65..b786e6940 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -10,6 +10,7 @@ import {
 	MdMic,
 	MdMicOff,
 	MdMonitor,
+	MdMouse,
 	MdRestartAlt,
 	MdVideocam,
 	MdVideocamOff,
@@ -43,6 +44,7 @@ const ICON_CONFIG = {
 	micOff: { icon: MdMicOff, size: ICON_SIZE },
 	webcamOn: { icon: MdVideocam, size: ICON_SIZE },
 	webcamOff: { icon: MdVideocamOff, size: ICON_SIZE },
+	cursor: { icon: MdMouse, size: ICON_SIZE },
 	pause: { icon: BsPauseCircle, size: ICON_SIZE },
 	resume: { icon: BsPlayCircle, size: ICON_SIZE },
 	stop: { icon: FaRegStopCircle, size: ICON_SIZE },
@@ -109,6 +111,8 @@ export function LaunchWindow() {
 		webcamDeviceId,
 		setWebcamDeviceId,
 		setWebcamDeviceName,
+		cursorCaptureMode,
+		setCursorCaptureMode,
 	} = useScreenRecorder();
 
 	const showMicControls = microphoneEnabled && !recording;
@@ -122,6 +126,7 @@ export function LaunchWindow() {
 	const [isWebcamFocused, setIsWebcamFocused] = useState(false);
 	const webcamExpanded = isWebcamHovered || isWebcamFocused;
 	const [isLanguageMenuOpen, setIsLanguageMenuOpen] = useState(false);
+	const [isWindows, setIsWindows] = useState(false);
 	const languageTriggerRef = useRef<HTMLButtonElement | null>(null);
 	const languageMenuPanelRef = useRef<HTMLDivElement | null>(null);
 	const [languageMenuStyle, setLanguageMenuStyle] = useState<{
@@ -180,6 +185,26 @@ export function LaunchWindow() {
 		}
 	}, [selectedCameraId, cameraDevices, setWebcamDeviceId, setWebcamDeviceName]);
 
+	useEffect(() => {
+		let cancelled = false;
+		nativeBridgeClient.system
+			.getPlatform()
+			.then((platform) => {
+				if (!cancelled) {
+					setIsWindows(platform === "win32");
+				}
+			})
+			.catch(() => {
+				if (!cancelled) {
+					setIsWindows(false);
+				}
+			});
+
+		return () => {
+			cancelled = true;
+		};
+	}, []);
+
 	useEffect(() => {
 		if (!import.meta.env.DEV) {
 			return;
@@ -570,6 +595,33 @@ export function LaunchWindow() {
 							? getIcon("webcamOn", "text-green-400")
 							: getIcon("webcamOff", "text-white/40")}
 					</button>
+					{isWindows && (
+						<button
+							data-testid="launch-cursor-mode-button"
+							className={`${hudIconBtnClasses} ${
+								cursorCaptureMode === "editable-overlay"
+									? "drop-shadow-[0_0_4px_rgba(74,222,128,0.4)]"
+									: ""
+							}`}
+							onClick={() =>
+								!recording &&
+								setCursorCaptureMode(
+									cursorCaptureMode === "editable-overlay" ? "system" : "editable-overlay",
+								)
+							}
+							disabled={recording}
+							title={
+								cursorCaptureMode === "editable-overlay"
+									? t("cursor.useSystemCursor")
+									: t("cursor.useEditableCursor")
+							}
+						>
+							{getIcon(
+								"cursor",
+								cursorCaptureMode === "editable-overlay" ? "text-green-400" : "text-white/40",
+							)}
+						</button>
+					)}
 				</div>
 
 				{/* Record/Stop group */}
diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsx
index 376b52ef7..c2fbbadf0 100644
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@ -16,6 +16,7 @@ import { useShortcuts } from "@/contexts/ShortcutsContext";
 import { INITIAL_EDITOR_STATE, useEditorHistory } from "@/hooks/useEditorHistory";
 import { type Locale } from "@/i18n/config";
 import { getAvailableLocales, getLocaleName } from "@/i18n/loader";
+import { hasNativeCursorRecordingData } from "@/lib/cursor/nativeCursor";
 import {
 	calculateOutputDimensions,
 	type ExportFormat,
@@ -29,7 +30,7 @@ import {
 	VideoExporter,
 } from "@/lib/exporter";
 import { computeFrameStepTime } from "@/lib/frameStep";
-import type { ProjectMedia } from "@/lib/recordingSession";
+import type { CursorCaptureMode, ProjectMedia } from "@/lib/recordingSession";
 import { matchesShortcut } from "@/lib/shortcuts";
 import { loadUserPreferences, saveUserPreferences } from "@/lib/userPreferences";
 import { BackgroundLoadError } from "@/lib/wallpaper";
@@ -186,6 +187,8 @@ export default function VideoEditor() {
 	const [cursorMotionBlur, setCursorMotionBlur] = useState(DEFAULT_CURSOR_MOTION_BLUR);
 	const [cursorClickBounce, setCursorClickBounce] = useState(DEFAULT_CURSOR_CLICK_BOUNCE);
 	const [nativePlatform, setNativePlatform] = useState<NativePlatform | null>(null);
+	const [recordingCursorCaptureMode, setRecordingCursorCaptureMode] =
+		useState<CursorCaptureMode | null>(null);
 
 	const videoPlaybackRef = useRef<VideoPlaybackRef>(null);
 
@@ -194,7 +197,11 @@ export default function VideoEditor() {
 	const nextSpeedIdRef = useRef(1);
 
 	const { shortcuts, isMac } = useShortcuts();
-	const showCursorSettings = nativePlatform === "win32";
+	const hasEditableCursorRecording =
+		recordingCursorCaptureMode === "editable-overlay" ||
+		(recordingCursorCaptureMode === null && hasNativeCursorRecordingData(cursorRecordingData));
+	const effectiveShowCursor = showCursor && hasEditableCursorRecording;
+	const showCursorSettings = nativePlatform === "win32" && hasEditableCursorRecording;
 	// Off-Mac doesn't have click telemetry, so force `onlyOnClicks` off for
 	// renderers while keeping the persisted value intact for round-tripping.
 	const effectiveCursorHighlight = useMemo(
@@ -227,10 +234,18 @@ export default function VideoEditor() {
 
 		const webcamSourcePath =
 			webcamVideoSourcePath ?? (webcamVideoPath ? fromFileUrl(webcamVideoPath) : null);
-		return webcamSourcePath
-			? { screenVideoPath, webcamVideoPath: webcamSourcePath }
-			: { screenVideoPath };
-	}, [videoPath, videoSourcePath, webcamVideoPath, webcamVideoSourcePath]);
+		return {
+			screenVideoPath,
+			...(webcamSourcePath ? { webcamVideoPath: webcamSourcePath } : {}),
+			...(recordingCursorCaptureMode ? { cursorCaptureMode: recordingCursorCaptureMode } : {}),
+		};
+	}, [
+		videoPath,
+		videoSourcePath,
+		webcamVideoPath,
+		webcamVideoSourcePath,
+		recordingCursorCaptureMode,
+	]);
 
 	const applyLoadedProject = useCallback(
 		async (candidate: unknown, path?: string | null) => {
@@ -245,6 +260,7 @@ export default function VideoEditor() {
 			}
 			const sourcePath = projectMedia.screenVideoPath;
 			const webcamSourcePath = projectMedia.webcamVideoPath ?? null;
+			const projectCursorCaptureMode = projectMedia.cursorCaptureMode ?? null;
 			const normalizedEditor = normalizeProjectEditor(project.editor);
 			const inferredDurationMs = Math.max(
 				0,
@@ -268,6 +284,7 @@ export default function VideoEditor() {
 			setVideoPath(toFileUrl(sourcePath));
 			setWebcamVideoSourcePath(webcamSourcePath);
 			setWebcamVideoPath(webcamSourcePath ? toFileUrl(webcamSourcePath) : null);
+			setRecordingCursorCaptureMode(projectCursorCaptureMode);
 			setCurrentProjectPath(path ?? null);
 
 			pushState({
@@ -324,9 +341,11 @@ export default function VideoEditor() {
 
 			setLastSavedSnapshot(
 				createProjectSnapshot(
-					webcamSourcePath
-						? { screenVideoPath: sourcePath, webcamVideoPath: webcamSourcePath }
-						: { screenVideoPath: sourcePath },
+					{
+						screenVideoPath: sourcePath,
+						...(webcamSourcePath ? { webcamVideoPath: webcamSourcePath } : {}),
+						...(projectCursorCaptureMode ? { cursorCaptureMode: projectCursorCaptureMode } : {}),
+					},
 					normalizedEditor,
 				),
 			);
@@ -412,15 +431,17 @@ export default function VideoEditor() {
 					setVideoPath(toFileUrl(sourcePath));
 					setWebcamVideoSourcePath(webcamSourcePath);
 					setWebcamVideoPath(webcamSourcePath ? toFileUrl(webcamSourcePath) : null);
+					setRecordingCursorCaptureMode(session.cursorCaptureMode ?? null);
 					setCurrentProjectPath(null);
 					setLastSavedSnapshot(
 						createProjectSnapshot(
-							webcamSourcePath
-								? {
-										screenVideoPath: sourcePath,
-										webcamVideoPath: webcamSourcePath,
-									}
-								: { screenVideoPath: sourcePath },
+							{
+								screenVideoPath: sourcePath,
+								...(webcamSourcePath ? { webcamVideoPath: webcamSourcePath } : {}),
+								...(session.cursorCaptureMode
+									? { cursorCaptureMode: session.cursorCaptureMode }
+									: {}),
+							},
 							INITIAL_EDITOR_STATE,
 						),
 					);
@@ -431,6 +452,7 @@ export default function VideoEditor() {
 				if (result.success && result.path) {
 					setVideoSourcePath(result.path);
 					setVideoPath(toFileUrl(result.path));
+					setRecordingCursorCaptureMode(null);
 					setCurrentProjectPath(null);
 					setLastSavedSnapshot(
 						createProjectSnapshot({ screenVideoPath: result.path }, INITIAL_EDITOR_STATE),
@@ -1458,7 +1480,7 @@ export default function VideoEditor() {
 						videoPadding: padding,
 						cropRegion,
 						cursorRecordingData,
-						cursorScale: showCursor ? cursorSize : 0,
+						cursorScale: effectiveShowCursor ? cursorSize : 0,
 						cursorSmoothing,
 						cursorMotionBlur,
 						cursorClickBounce,
@@ -1605,7 +1627,7 @@ export default function VideoEditor() {
 						padding,
 						cropRegion,
 						cursorRecordingData,
-						cursorScale: showCursor ? cursorSize : 0,
+						cursorScale: effectiveShowCursor ? cursorSize : 0,
 						cursorSmoothing,
 						cursorMotionBlur,
 						cursorClickBounce,
@@ -1705,7 +1727,7 @@ export default function VideoEditor() {
 			cursorTelemetry,
 			cursorClickTimestamps,
 			effectiveCursorHighlight,
-			showCursor,
+			effectiveShowCursor,
 			cursorSize,
 			cursorSmoothing,
 			cursorMotionBlur,
@@ -1970,7 +1992,7 @@ export default function VideoEditor() {
 											cursorTelemetry={cursorTelemetry}
 											cursorHighlight={effectiveCursorHighlight}
 											cursorClickTimestamps={cursorClickTimestamps}
-											showCursor={showCursor}
+											showCursor={effectiveShowCursor}
 											cursorSize={cursorSize}
 											cursorSmoothing={cursorSmoothing}
 											cursorMotionBlur={cursorMotionBlur}
@@ -2173,7 +2195,9 @@ export default function VideoEditor() {
 						onCursorMotionBlurChange={setCursorMotionBlur}
 						cursorClickBounce={cursorClickBounce}
 						onCursorClickBounceChange={setCursorClickBounce}
-						hasCursorData={cursorTelemetry.length > 0}
+						hasCursorData={
+							cursorTelemetry.length > 0 || hasNativeCursorRecordingData(cursorRecordingData)
+						}
 						showCursorSettings={showCursorSettings}
 						showCursorHighlightSettings={isMac}
 					/>
diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.ts
index 1c39e29eb..45aa7b3b5 100644
--- a/src/hooks/useScreenRecorder.ts
+++ b/src/hooks/useScreenRecorder.ts
@@ -6,6 +6,7 @@ import {
 	type NativeWindowsRecordingRequest,
 	parseWindowHandleFromSourceId,
 } from "@/lib/nativeWindowsRecording";
+import type { CursorCaptureMode } from "@/lib/recordingSession";
 import { requestCameraAccess } from "@/lib/requestCameraAccess";
 
 const TARGET_FRAME_RATE = 60;
@@ -65,6 +66,8 @@ type UseScreenRecorderReturn = {
 	setSystemAudioEnabled: (enabled: boolean) => void;
 	webcamEnabled: boolean;
 	setWebcamEnabled: (enabled: boolean) => Promise<boolean>;
+	cursorCaptureMode: CursorCaptureMode;
+	setCursorCaptureMode: (mode: CursorCaptureMode) => void;
 };
 
 type RecorderHandle = {
@@ -111,6 +114,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 	const [webcamDeviceName, setWebcamDeviceName] = useState<string | undefined>(undefined);
 	const [systemAudioEnabled, setSystemAudioEnabled] = useState(false);
 	const [webcamEnabled, setWebcamEnabledState] = useState(false);
+	const [cursorCaptureMode, setCursorCaptureMode] = useState<CursorCaptureMode>("editable-overlay");
 	const screenRecorder = useRef<RecorderHandle | null>(null);
 	const webcamRecorder = useRef<RecorderHandle | null>(null);
 	const nativeWindowsRecording = useRef<NativeWindowsRecordingHandle | null>(null);
@@ -368,6 +372,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 								}
 							: undefined,
 						createdAt: activeRecordingId,
+						cursorCaptureMode,
 					});
 
 					if (!result.success) {
@@ -394,7 +399,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 				}
 			})();
 		},
-		[teardownMedia],
+		[cursorCaptureMode, teardownMedia],
 	);
 
 	const finalizeNativeWindowsRecording = useCallback(async (discard = false) => {
@@ -645,6 +650,9 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 					height: WEBCAM_TARGET_HEIGHT,
 					fps: WEBCAM_TARGET_FRAME_RATE,
 				},
+				cursor: {
+					mode: cursorCaptureMode,
+				},
 			};
 			const result = await window.electronAPI.startNativeWindowsRecording(request);
 			if (!result.success || !result.recordingId) {
@@ -765,12 +773,11 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 
 			if (platform === "win32") {
 				// getDisplayMedia + setDisplayMediaRequestHandler (main.ts) supplies the
-				// pre-selected source and honors cursor:"never" to exclude the system cursor
-				// from every captured frame. System audio is provided via WASAPI loopback
-				// on Windows when the user has enabled it.
+				// pre-selected source. Editable cursor mode excludes the system cursor so
+				// the editor can render a replacement; system mode bakes it into the video.
 				screenMediaStream = await navigator.mediaDevices.getDisplayMedia({
 					video: {
-						cursor: "never",
+						cursor: cursorCaptureMode === "editable-overlay" ? "never" : "always",
 						width: { max: TARGET_WIDTH },
 						height: { max: TARGET_HEIGHT },
 						frameRate: { ideal: TARGET_FRAME_RATE },
@@ -976,7 +983,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 			setRecording(true);
 			setPaused(false);
 			setElapsedSeconds(0);
-			window.electronAPI?.setRecordingState(true, recordingId.current);
+			window.electronAPI?.setRecordingState(true, recordingId.current, cursorCaptureMode);
 
 			const activeScreenRecorder = screenRecorder.current;
 			const activeWebcamRecorder = webcamRecorder.current;
@@ -1192,5 +1199,7 @@ export function useScreenRecorder(): UseScreenRecorderReturn {
 		setSystemAudioEnabled,
 		webcamEnabled,
 		setWebcamEnabled,
+		cursorCaptureMode,
+		setCursorCaptureMode,
 	};
 }
diff --git a/src/i18n/locales/en/launch.json b/src/i18n/locales/en/launch.json
index e959a5478..133a96127 100644
--- a/src/i18n/locales/en/launch.json
+++ b/src/i18n/locales/en/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "No camera found",
 		"unavailable": "Camera unavailable"
 	},
+	"cursor": {
+		"useEditableCursor": "Use editable cursor",
+		"useSystemCursor": "Use system cursor"
+	},
 	"sourceSelector": {
 		"loading": "Loading sources...",
 		"screens": "Screens ({{count}})",
diff --git a/src/i18n/locales/es/launch.json b/src/i18n/locales/es/launch.json
index 68919aac2..e0d2c3c6c 100644
--- a/src/i18n/locales/es/launch.json
+++ b/src/i18n/locales/es/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "No se encontró cámara",
 		"unavailable": "Cámara no disponible"
 	},
+	"cursor": {
+		"useEditableCursor": "Usar cursor editable",
+		"useSystemCursor": "Usar cursor del sistema"
+	},
 	"sourceSelector": {
 		"loading": "Cargando fuentes...",
 		"screens": "Pantallas ({{count}})",
diff --git a/src/i18n/locales/fr/launch.json b/src/i18n/locales/fr/launch.json
index 55521cb44..33e623660 100644
--- a/src/i18n/locales/fr/launch.json
+++ b/src/i18n/locales/fr/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "Aucune caméra trouvée",
 		"unavailable": "Caméra non disponible"
 	},
+	"cursor": {
+		"useEditableCursor": "Utiliser le curseur éditable",
+		"useSystemCursor": "Utiliser le curseur système"
+	},
 	"sourceSelector": {
 		"loading": "Chargement des sources...",
 		"screens": "Écrans ({{count}})",
diff --git a/src/i18n/locales/ja-JP/launch.json b/src/i18n/locales/ja-JP/launch.json
index 51e3833f9..601cf2d8b 100644
--- a/src/i18n/locales/ja-JP/launch.json
+++ b/src/i18n/locales/ja-JP/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "カメラが見つかりません",
 		"unavailable": "カメラが利用できません"
 	},
+	"cursor": {
+		"useEditableCursor": "編集可能なカーソルを使う",
+		"useSystemCursor": "システムカーソルを使う"
+	},
 	"sourceSelector": {
 		"loading": "ソースを読み込み中...",
 		"screens": "画面 ({{count}})",
diff --git a/src/i18n/locales/ko-KR/launch.json b/src/i18n/locales/ko-KR/launch.json
index d9f6d6ab8..07e063283 100644
--- a/src/i18n/locales/ko-KR/launch.json
+++ b/src/i18n/locales/ko-KR/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "카메라를 찾을 수 없음",
 		"unavailable": "카메라를 사용할 수 없음"
 	},
+	"cursor": {
+		"useEditableCursor": "편집 가능한 커서 사용",
+		"useSystemCursor": "시스템 커서 사용"
+	},
 	"sourceSelector": {
 		"loading": "소스 불러오는 중...",
 		"screens": "화면 ({{count}}개)",
diff --git a/src/i18n/locales/tr/launch.json b/src/i18n/locales/tr/launch.json
index 177ba3f52..19039c84b 100644
--- a/src/i18n/locales/tr/launch.json
+++ b/src/i18n/locales/tr/launch.json
@@ -35,6 +35,10 @@
 		"noneFound": "Kamera bulunamadı",
 		"unavailable": "Kamera kullanılamıyor"
 	},
+	"cursor": {
+		"useEditableCursor": "Düzenlenebilir imleci kullan",
+		"useSystemCursor": "Sistem imlecini kullan"
+	},
 	"sourceSelector": {
 		"loading": "Kaynaklar yükleniyor...",
 		"screens": "Ekranlar ({{count}})",
diff --git a/src/i18n/locales/zh-CN/launch.json b/src/i18n/locales/zh-CN/launch.json
index a5c2a9d07..ae399e3f5 100644
--- a/src/i18n/locales/zh-CN/launch.json
+++ b/src/i18n/locales/zh-CN/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "未找到摄像头",
 		"unavailable": "摄像头不可用"
 	},
+	"cursor": {
+		"useEditableCursor": "使用可编辑光标",
+		"useSystemCursor": "使用系统光标"
+	},
 	"sourceSelector": {
 		"loading": "正在加载源...",
 		"screens": "屏幕 ({{count}})",
diff --git a/src/i18n/locales/zh-TW/launch.json b/src/i18n/locales/zh-TW/launch.json
index ea7e6251c..9629c86f7 100644
--- a/src/i18n/locales/zh-TW/launch.json
+++ b/src/i18n/locales/zh-TW/launch.json
@@ -24,6 +24,10 @@
 		"noneFound": "未找到攝影機",
 		"unavailable": "攝影機不可用"
 	},
+	"cursor": {
+		"useEditableCursor": "使用可編輯游標",
+		"useSystemCursor": "使用系統游標"
+	},
 	"sourceSelector": {
 		"loading": "正在載入來源...",
 		"screens": "螢幕 ({{count}})",
diff --git a/src/lib/nativeWindowsRecording.ts b/src/lib/nativeWindowsRecording.ts
index c19e819b8..5e0685171 100644
--- a/src/lib/nativeWindowsRecording.ts
+++ b/src/lib/nativeWindowsRecording.ts
@@ -33,6 +33,9 @@ export type NativeWindowsRecordingRequest = {
 		height: number;
 		fps: number;
 	};
+	cursor: {
+		mode: import("./recordingSession").CursorCaptureMode;
+	};
 };
 
 export type NativeWindowsRecordingStartResult = {
diff --git a/src/lib/recordingSession.ts b/src/lib/recordingSession.ts
index 17cf7c1fa..f5ebf9ca2 100644
--- a/src/lib/recordingSession.ts
+++ b/src/lib/recordingSession.ts
@@ -1,8 +1,11 @@
 export interface ProjectMedia {
 	screenVideoPath: string;
 	webcamVideoPath?: string;
+	cursorCaptureMode?: CursorCaptureMode;
 }
 
+export type CursorCaptureMode = "editable-overlay" | "system";
+
 export interface RecordingSession extends ProjectMedia {
 	createdAt: number;
 }
@@ -16,6 +19,11 @@ export interface StoreRecordedSessionInput {
 	screen: RecordedVideoAssetInput;
 	webcam?: RecordedVideoAssetInput;
 	createdAt?: number;
+	cursorCaptureMode?: CursorCaptureMode;
+}
+
+export function normalizeCursorCaptureMode(value: unknown): CursorCaptureMode | undefined {
+	return value === "editable-overlay" || value === "system" ? value : undefined;
 }
 
 function normalizePath(value: unknown): string | undefined {
@@ -40,12 +48,13 @@ export function normalizeProjectMedia(candidate: unknown): ProjectMedia | null {
 	}
 
 	const webcamVideoPath = normalizePath(raw.webcamVideoPath);
+	const cursorCaptureMode = normalizeCursorCaptureMode(raw.cursorCaptureMode);
 
-	return webcamVideoPath
-		? { screenVideoPath, webcamVideoPath }
-		: {
-				screenVideoPath,
-			};
+	return {
+		screenVideoPath,
+		...(webcamVideoPath ? { webcamVideoPath } : {}),
+		...(cursorCaptureMode ? { cursorCaptureMode } : {}),
+	};
 }
 
 export function normalizeRecordingSession(candidate: unknown): RecordingSession | null {

From cce35aef6d18b37b6defcd1f771db368291a8997 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Wed, 6 May 2026 15:31:33 +0200
Subject: [PATCH 38/38] fix: preserve Windows system audio on export

---
 src/lib/exporter/audioEncoder.test.ts |  34 +++++-
 src/lib/exporter/audioEncoder.ts      | 151 +++++++++++++++++++++++---
 2 files changed, 167 insertions(+), 18 deletions(-)

diff --git a/src/lib/exporter/audioEncoder.test.ts b/src/lib/exporter/audioEncoder.test.ts
index 5d66989ab..0fb3708c5 100644
--- a/src/lib/exporter/audioEncoder.test.ts
+++ b/src/lib/exporter/audioEncoder.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { AudioProcessor } from "./audioEncoder";
+import { AudioProcessor, downmixPlanarChannelsForExport } from "./audioEncoder";
 
 describe("AudioProcessor.selectSupportedExportCodec", () => {
 	afterEach(() => {
@@ -38,3 +38,35 @@ describe("AudioProcessor.selectSupportedExportCodec", () => {
 		});
 	});
 });
+
+describe("downmixPlanarChannelsForExport", () => {
+	it("preserves non-front Windows system audio channels when exporting stereo", () => {
+		const sourcePlanes = Array.from({ length: 8 }, (_, channel) => {
+			const plane = new Float32Array(2);
+			if (channel === 2) {
+				plane[0] = 0.8;
+				plane[1] = 0.4;
+			}
+			if (channel === 6) {
+				plane[0] = 0.2;
+				plane[1] = 0.1;
+			}
+			return plane;
+		});
+
+		const stereo = downmixPlanarChannelsForExport(sourcePlanes, 2);
+
+		expect(stereo[0]).toBeGreaterThan(0);
+		expect(stereo[1]).toBeGreaterThan(0);
+		expect(stereo[2]).toBeGreaterThan(0);
+		expect(stereo[3]).toBeGreaterThan(0);
+	});
+
+	it("duplicates mono microphone audio when exporting stereo", () => {
+		const mono = new Float32Array([0.25, -0.5]);
+
+		const stereo = downmixPlanarChannelsForExport([mono], 2);
+
+		expect(Array.from(stereo)).toEqual([0.25, -0.5, 0.25, -0.5]);
+	});
+});
diff --git a/src/lib/exporter/audioEncoder.ts b/src/lib/exporter/audioEncoder.ts
index 0d6a62275..95227844d 100644
--- a/src/lib/exporter/audioEncoder.ts
+++ b/src/lib/exporter/audioEncoder.ts
@@ -22,6 +22,138 @@ const EXPORT_AUDIO_CODECS: ExportAudioCodecCandidate[] = [
 	{ encoderCodec: "opus", muxerCodec: "opus", label: "Opus" },
 ];
 
+function averageChannels(sourcePlanes: Float32Array[], frame: number) {
+	let mixed = 0;
+	for (const plane of sourcePlanes) {
+		mixed += plane[frame] ?? 0;
+	}
+	return mixed / Math.max(1, sourcePlanes.length);
+}
+
+function weightedSample(
+	sourcePlanes: Float32Array[],
+	frame: number,
+	weights: Array<[channel: number, weight: number]>,
+) {
+	let mixed = 0;
+	let weightSum = 0;
+	for (const [channel, weight] of weights) {
+		const sample = sourcePlanes[channel]?.[frame];
+		if (typeof sample !== "number") {
+			continue;
+		}
+		mixed += sample * weight;
+		weightSum += weight;
+	}
+	return weightSum > 0 ? mixed / weightSum : averageChannels(sourcePlanes, frame);
+}
+
+function getStereoDownmixWeights(sourceChannels: number) {
+	const centerWeight = Math.SQRT1_2;
+	const surroundWeight = Math.SQRT1_2;
+	const lfeWeight = 0.5;
+
+	if (sourceChannels >= 8) {
+		// Windows 7.1 order: FL, FR, FC, LFE, BL, BR, SL, SR.
+		return {
+			left: [
+				[0, 1],
+				[2, centerWeight],
+				[3, lfeWeight],
+				[4, surroundWeight],
+				[6, surroundWeight],
+			] satisfies Array<[number, number]>,
+			right: [
+				[1, 1],
+				[2, centerWeight],
+				[3, lfeWeight],
+				[5, surroundWeight],
+				[7, surroundWeight],
+			] satisfies Array<[number, number]>,
+		};
+	}
+
+	if (sourceChannels >= 6) {
+		// Windows 5.1 order: FL, FR, FC, LFE, BL, BR.
+		return {
+			left: [
+				[0, 1],
+				[2, centerWeight],
+				[3, lfeWeight],
+				[4, surroundWeight],
+			] satisfies Array<[number, number]>,
+			right: [
+				[1, 1],
+				[2, centerWeight],
+				[3, lfeWeight],
+				[5, surroundWeight],
+			] satisfies Array<[number, number]>,
+		};
+	}
+
+	if (sourceChannels >= 4) {
+		return {
+			left: [
+				[0, 1],
+				[2, surroundWeight],
+			] satisfies Array<[number, number]>,
+			right: [
+				[1, 1],
+				[3, surroundWeight],
+			] satisfies Array<[number, number]>,
+		};
+	}
+
+	return {
+		left: [
+			[0, 1],
+			[2, centerWeight],
+		] satisfies Array<[number, number]>,
+		right: [
+			[1, 1],
+			[2, centerWeight],
+		] satisfies Array<[number, number]>,
+	};
+}
+
+export function downmixPlanarChannelsForExport(
+	sourcePlanes: Float32Array[],
+	targetChannels: number,
+): Float32Array {
+	const frameCount = sourcePlanes[0]?.length ?? 0;
+	const output = new Float32Array(frameCount * targetChannels);
+
+	if (targetChannels === 1) {
+		for (let frame = 0; frame < frameCount; frame++) {
+			output[frame] = averageChannels(sourcePlanes, frame);
+		}
+		return output;
+	}
+
+	if (targetChannels !== 2) {
+		throw new Error(`Unsupported target channel count: ${targetChannels}`);
+	}
+
+	if (sourcePlanes.length === 1) {
+		output.set(sourcePlanes[0], 0);
+		output.set(sourcePlanes[0], frameCount);
+		return output;
+	}
+
+	if (sourcePlanes.length === 2) {
+		output.set(sourcePlanes[0], 0);
+		output.set(sourcePlanes[1], frameCount);
+		return output;
+	}
+
+	const weights = getStereoDownmixWeights(sourcePlanes.length);
+	for (let frame = 0; frame < frameCount; frame++) {
+		output[frame] = weightedSample(sourcePlanes, frame, weights.left);
+		output[frameCount + frame] = weightedSample(sourcePlanes, frame, weights.right);
+	}
+	return output;
+}
+
 export class AudioProcessor {
 	private cancelled = false;
 
@@ -665,22 +797,7 @@ export class AudioProcessor {
 			});
 		}
 
-		const output = new Float32Array(frameCount * targetChannels);
-		if (targetChannels === 1) {
-			for (let frame = 0; frame < frameCount; frame++) {
-				let mixed = 0;
-				for (let channel = 0; channel < sourceChannels; channel++) {
-					mixed += sourcePlanes[channel][frame];
-				}
-				output[frame] = mixed / sourceChannels;
-			}
-		} else if (sourceChannels === 1) {
-			output.set(sourcePlanes[0], 0);
-			output.set(sourcePlanes[0], frameCount);
-		} else {
-			output.set(sourcePlanes[0], 0);
-			output.set(sourcePlanes[1], frameCount);
-		}
+		const output = downmixPlanarChannelsForExport(sourcePlanes, targetChannels);
 
 		return new AudioData({
 			format: "f32-planar",
@@ -688,7 +805,7 @@ export class AudioProcessor {
 			numberOfFrames: frameCount,
 			numberOfChannels: targetChannels,
 			timestamp: newTimestamp,
-			data: output,
+			data: output.buffer instanceof ArrayBuffer ? output.buffer : output.slice().buffer,
 		});
 	}