node-mac-recorder 2.2.1 → 2.4.0

package/README.md

@@ -1,6 +1,6 @@
 # node-mac-recorder
 
-A powerful native macOS screen recording Node.js package with advanced window selection, multi-display support, and granular audio controls. Built with AVFoundation and ScreenCaptureKit for optimal performance.
+A powerful native macOS screen recording Node.js package with advanced window selection, multi-display support, and granular audio controls. Built with AVFoundation for optimal performance.
 
 ## Features
 
@@ -12,7 +12,6 @@ A powerful native macOS screen recording Node.js package with advanced window se
 - 🖱️ **Multi-Display Support** - Automatic display detection and selection
 - 🎨 **Cursor Control** - Toggle cursor visibility in recordings
 - 🖱️ **Cursor Tracking** - Track mouse position, cursor types, and click events
-- 🚫 **Exclude Apps/Windows (macOS 15+)** - Use ScreenCaptureKit to exclude specific apps (bundle id/PID) and windows
 
 🎵 **Granular Audio Controls**
 
@@ -50,11 +49,6 @@ npm install node-mac-recorder
 - **Screen Recording Permission** (automatically requested)
 - **CPU Architecture**: Intel (x64) and Apple Silicon (ARM64) supported
 
-ScreenCaptureKit path and exclusion support:
-
-- Requires macOS 15.0+ for on-disk recording via `SCRecordingOutput`
-- On older systems (<=14), the library falls back to AVFoundation automatically (exclusions not available)
-
 ### Build Requirements
 
 ```bash
@@ -116,22 +110,9 @@ await recorder.startRecording("./recording.mov", {
 	quality: "high", // 'low', 'medium', 'high'
 	frameRate: 30, // FPS (15, 30, 60)
 	captureCursor: false, // Show cursor (default: false)
-
-	// ScreenCaptureKit (macOS 15+) - optional, backward compatible
-	useScreenCaptureKit: false, // If true and available, prefers ScreenCaptureKit
-	excludedAppBundleIds: ["com.apple.Safari"], // Exclude by bundle id
-	excludedPIDs: [process.pid], // Exclude by PID
-	excludedWindowIds: [12345, 67890], // Exclude specific window IDs
-	// When running under Electron, autoExcludeSelf defaults to true
-	autoExcludeSelf: true,
 });
 ```
 
-Notes
-
-- If any of `excludedAppBundleIds`, `excludedPIDs`, `excludedWindowIds` are provided, the library automatically switches to ScreenCaptureKit on supported macOS versions.
-- When running inside Electron, the current app PID is excluded by default (`autoExcludeSelf: true`).
-
 #### `stopRecording()`
 
 Stops the current recording.
@@ -324,29 +305,6 @@ await new Promise((resolve) => setTimeout(resolve, 10000)); // 10 seconds
 await recorder.stopRecording();
 ```
 
-### Exclude Electron app and other windows (ScreenCaptureKit)
-
-```javascript
-const recorder = new MacRecorder();
-
-// By default, when running inside Electron, your app is auto-excluded.
-// You can also exclude other apps/windows explicitly:
-await recorder.startRecording("./excluded.mov", {
-	captureCursor: true,
-	// Prefer SC explicitly (optional — auto-enabled when exclusions are set)
-	useScreenCaptureKit: true,
-	excludedAppBundleIds: ["com.apple.Safari"],
-	excludedWindowIds: [
-		/* CGWindowID list */
-	],
-	// autoExcludeSelf is true by default on Electron; set false to include your app
-	// autoExcludeSelf: false,
-});
-
-// ... later
-await recorder.stopRecording();
-```
-
 ### Multi-Display Recording
 
 ```javascript
@@ -404,17 +362,16 @@ audioDevices.forEach((device, i) => {
 });
 
 // Find system audio device (like BlackHole, Soundflower, etc.)
-const systemAudioDevice = audioDevices.find(
-	(device) =>
-		device.name.toLowerCase().includes("blackhole") ||
-		device.name.toLowerCase().includes("soundflower") ||
-		device.name.toLowerCase().includes("loopback") ||
-		device.name.toLowerCase().includes("aggregate")
+const systemAudioDevice = audioDevices.find(device => 
+	device.name.toLowerCase().includes('blackhole') ||
+	device.name.toLowerCase().includes('soundflower') ||
+	device.name.toLowerCase().includes('loopback') ||
+	device.name.toLowerCase().includes('aggregate')
 );
 
 if (systemAudioDevice) {
 	console.log(`Using system audio device: ${systemAudioDevice.name}`);
-
+	
 	// Record with specific system audio device
 	await recorder.startRecording("./system-audio-specific.mov", {
 		includeMicrophone: false,
@@ -423,10 +380,8 @@ if (systemAudioDevice) {
 		captureArea: { x: 0, y: 0, width: 1, height: 1 }, // Minimal video
 	});
 } else {
-	console.log(
-		"No system audio device found. Installing BlackHole or Soundflower recommended."
-	);
-
+	console.log("No system audio device found. Installing BlackHole or Soundflower recommended.");
+	
 	// Record with default system audio capture (may not work without virtual audio device)
 	await recorder.startRecording("./system-audio-default.mov", {
 		includeMicrophone: false,
@@ -436,7 +391,7 @@ if (systemAudioDevice) {
 }
 
 // Record for 10 seconds
-await new Promise((resolve) => setTimeout(resolve, 10000));
+await new Promise(resolve => setTimeout(resolve, 10000));
 await recorder.stopRecording();
 ```
 
@@ -445,7 +400,7 @@ await recorder.stopRecording();
 For reliable system audio capture, install a virtual audio device:
 
 1. **BlackHole** (Free): https://github.com/ExistentialAudio/BlackHole
-2. **Soundflower** (Free): https://github.com/mattingalls/Soundflower
+2. **Soundflower** (Free): https://github.com/mattingalls/Soundflower  
 3. **Loopback** (Paid): https://rogueamoeba.com/loopback/
 
 These create aggregate audio devices that the package can detect and use for system audio capture.
@@ -765,11 +720,6 @@ npm cache clean --force
 xcode-select --install
 ```
 
-### ScreenCaptureKit availability
-
-- Exclusions require macOS 15+ (uses `SCRecordingOutput`).
-- On macOS 12.3–14, the module will fall back to AVFoundation (no exclusions). This is automatic and backward-compatible.
-
 ### Recording Issues
 
 1. **Empty/Black Video**: Check screen recording permissions
@@ -824,24 +774,12 @@ MIT License - see [LICENSE](LICENSE) file for details.
 
 ### Latest Updates
 
-- ✅ ScreenCaptureKit path with exclusions (apps by bundle id/PID and window IDs) on macOS 15+
-- ✅ Electron apps auto-excluded by default (can be disabled with `autoExcludeSelf: false`)
-- ✅ Prebuilt binaries for darwin-arm64 and darwin-x64; automatic loading via `node-gyp-build`
-- ✅ Cursor Tracking: Track mouse position, cursor types, and click events with JSON export
-- ✅ Window Recording: Automatic coordinate conversion for multi-display setups
-- ✅ Audio Controls: Separate microphone and system audio controls
-- ✅ Display Selection: Multi-monitor support with automatic detection
-- ✅ Smart Filtering: Improved window detection and filtering
-- ✅ Performance: Optimized native implementation
-
-## Prebuilt binaries
-
-This package ships prebuilt native binaries for macOS:
-
-- darwin-arm64 (Apple Silicon)
-- darwin-x64 (Intel)
-
-At runtime, the correct binary is loaded automatically via `node-gyp-build`. If a prebuilt is not available for your environment, the module falls back to a local build.
+- ✅ **Cursor Tracking**: Track mouse position, cursor types, and click events with JSON export
+- ✅ **Window Recording**: Automatic coordinate conversion for multi-display setups
+- ✅ **Audio Controls**: Separate microphone and system audio controls
+- ✅ **Display Selection**: Multi-monitor support with automatic detection
+- ✅ **Smart Filtering**: Improved window detection and filtering
+- ✅ **Performance**: Optimized native implementation
 
 ---
 

package/binding.gyp

@@ -5,7 +5,6 @@
       "sources": [
         "src/mac_recorder.mm",
         "src/screen_capture.mm",
-        "src/screen_capture_kit.mm",
         "src/audio_capture.mm",
         "src/cursor_tracker.mm",
         "src/window_selector.mm"
@@ -22,11 +21,8 @@
         "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
         "CLANG_CXX_LIBRARY": "libc++",
         "MACOSX_DEPLOYMENT_TARGET": "12.3",
-<<<<<<< HEAD
-=======
         "ARCHS": ["arm64"],
         "VALID_ARCHS": ["arm64"],
->>>>>>> screencapture
         "OTHER_CFLAGS": [
           "-ObjC++",
           "-fmodules"
@@ -35,22 +31,15 @@
       },
       "link_settings": {
         "libraries": [
-<<<<<<< HEAD
-=======
           "-framework ScreenCaptureKit",
           "-framework AVFoundation",
           "-framework CoreMedia",
           "-framework CoreVideo",
->>>>>>> screencapture
           "-framework Foundation",
           "-framework AppKit",
           "-framework ApplicationServices",
           "-framework Carbon",
-          "-framework Accessibility",
-          "-framework CoreAudio",
-          "-framework AVFoundation",
-          "-framework CoreMedia",
-          "-framework CoreVideo"
+          "-framework Accessibility"
         ]
       },
       "defines": [ 

package/index.js

@@ -2,24 +2,19 @@ const { EventEmitter } = require("events");
 const path = require("path");
 const fs = require("fs");
 
-// Native modülü yükle (prebuilt > local build fallback)
+// Native modülü yükle
 let nativeBinding;
 try {
-	// Prebuilt
-	nativeBinding = require("node-gyp-build")(__dirname);
-} catch (e) {
+	nativeBinding = require("./build/Release/mac_recorder.node");
+} catch (error) {
 	try {
-		nativeBinding = require("./build/Release/mac_recorder.node");
-	} catch (error) {
-		try {
-			nativeBinding = require("./build/Debug/mac_recorder.node");
-		} catch (debugError) {
-			throw new Error(
-				'Native module not found. Please run "npm run build" to compile the native module.\n' +
-					"Original error: " +
-					(error?.message || e?.message)
-			);
-		}
+		nativeBinding = require("./build/Debug/mac_recorder.node");
+	} catch (debugError) {
+		throw new Error(
+			'Native module not found. Please run "npm run build" to compile the native module.\n' +
+				"Original error: " +
+				error.message
+		);
 	}
 }
 
@@ -50,12 +45,6 @@ class MacRecorder extends EventEmitter {
 			showClicks: false,
 			displayId: null, // Hangi ekranı kaydedeceği (null = ana ekran)
 			windowId: null, // Hangi pencereyi kaydedeceği (null = tam ekran)
-			// SC (gizli, opsiyonel) - mevcut kullanıcıları bozmaz
-			useScreenCaptureKit: false,
-			excludedAppBundleIds: [],
-			excludedPIDs: [],
-			excludedWindowIds: [],
-			autoExcludeSelf: !!(process.versions && process.versions.electron),
 		};
 
 		// Display cache için async initialization
@@ -129,22 +118,11 @@ class MacRecorder extends EventEmitter {
 			audioDeviceId: options.audioDeviceId || null, // null = default device
 			systemAudioDeviceId: options.systemAudioDeviceId || null, // null = auto-detect system audio device
 			captureArea: options.captureArea || null,
-<<<<<<< HEAD
-			useScreenCaptureKit: options.useScreenCaptureKit || false,
-			excludedAppBundleIds: options.excludedAppBundleIds || [],
-			excludedPIDs: options.excludedPIDs || [],
-			excludedWindowIds: options.excludedWindowIds || [],
-			autoExcludeSelf:
-				typeof options.autoExcludeSelf === "boolean"
-					? options.autoExcludeSelf
-					: !!(process.versions && process.versions.electron),
-=======
 			// Exclusion options
 			excludeCurrentApp: options.excludeCurrentApp || false,
 			excludeWindowIds: Array.isArray(options.excludeWindowIds)
 				? options.excludeWindowIds
 				: [],
->>>>>>> screencapture
 		};
 	}
 
@@ -305,17 +283,9 @@ class MacRecorder extends EventEmitter {
 					windowId: this.options.windowId || null, // null = tam ekran
 					audioDeviceId: this.options.audioDeviceId || null, // null = default device
 					systemAudioDeviceId: this.options.systemAudioDeviceId || null, // null = auto-detect system audio device
-<<<<<<< HEAD
-					useScreenCaptureKit: this.options.useScreenCaptureKit || false,
-					excludedAppBundleIds: this.options.excludedAppBundleIds || [],
-					excludedPIDs: this.options.excludedPIDs || [],
-					excludedWindowIds: this.options.excludedWindowIds || [],
-					autoExcludeSelf: this.options.autoExcludeSelf === true,
-=======
 					// Exclusion options passthrough
 					excludeCurrentApp: this.options.excludeCurrentApp || false,
 					excludeWindowIds: this.options.excludeWindowIds || [],
->>>>>>> screencapture
 				};
 
 				// Manuel captureArea varsa onu kullan
@@ -328,34 +298,10 @@ class MacRecorder extends EventEmitter {
 					};
 				}
 
-				// SC yolu: kullanıcıdan SC talebi varsa veya exclude listeleri doluysa ve SC mevcutsa otomatik kullan
-				let success;
-				try {
-					const wantsSC = !!(
-						this.options.useScreenCaptureKit ||
-						this.options.excludedAppBundleIds?.length ||
-						this.options.excludedPIDs?.length ||
-						this.options.excludedWindowIds?.length
-					);
-					const scAvailable =
-						typeof nativeBinding.isScreenCaptureKitAvailable === "function" &&
-						nativeBinding.isScreenCaptureKitAvailable();
-					if (wantsSC && scAvailable) {
-						const scOptions = {
-							...recordingOptions,
-							useScreenCaptureKit: true,
-						};
-						success = nativeBinding.startRecording(outputPath, scOptions);
-					} else {
-						success = nativeBinding.startRecording(
-							outputPath,
-							recordingOptions
-						);
-					}
-				} catch (e) {
-					// Fallback AVFoundation
-					success = nativeBinding.startRecording(outputPath, recordingOptions);
-				}
+				const success = nativeBinding.startRecording(
+					outputPath,
+					recordingOptions
+				);
 
 				if (success) {
 					this.isRecording = true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.2.1",
+	"version": "2.4.0",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [
@@ -38,19 +38,14 @@
 		"build": "node-gyp build",
 		"rebuild": "node-gyp rebuild",
 		"clean": "node-gyp clean",
-		"prebuild:darwin:arm64": "prebuildify --napi --strip --platform darwin --arch arm64",
-		"prebuild:darwin:x64": "prebuildify --napi --strip --platform darwin --arch x64",
-		"prebuild": "npm run prebuild:darwin:arm64 && npm run prebuild:darwin:x64",
 		"test:window-selector": "node window-selector-test.js",
 		"example:window-selector": "node examples/window-selector-example.js"
 	},
 	"dependencies": {
-		"node-addon-api": "^7.0.0",
-		"node-gyp-build": "^4.6.0"
+		"node-addon-api": "^7.0.0"
 	},
 	"devDependencies": {
-		"node-gyp": "^10.0.0",
-		"prebuildify": "^5.0.0"
+		"node-gyp": "^10.0.0"
 	},
 	"gypfile": true
 }

package/src/mac_recorder.mm

@@ -1,10 +1,7 @@
 #import <napi.h>
 #import <ScreenCaptureKit/ScreenCaptureKit.h>
-<<<<<<< HEAD
-=======
 #import <AVFoundation/AVFoundation.h>
 #import <CoreMedia/CoreMedia.h>
->>>>>>> screencapture
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
@@ -21,13 +18,9 @@ Napi::Object InitCursorTracker(Napi::Env env, Napi::Object exports);
 // Window selector function declarations
 Napi::Object InitWindowSelector(Napi::Env env, Napi::Object exports);
 
-<<<<<<< HEAD
-@interface MacRecorderDelegate : NSObject
-=======
 // ScreenCaptureKit Recording Delegate
 API_AVAILABLE(macos(12.3))
 @interface SCKRecorderDelegate : NSObject <SCStreamDelegate, SCStreamOutput>
->>>>>>> screencapture
 @property (nonatomic, copy) void (^completionHandler)(NSURL *outputURL, NSError *error);
 @property (nonatomic, copy) void (^startedHandler)(void);
 @property (nonatomic, strong) AVAssetWriter *assetWriter;
@@ -41,20 +34,6 @@ API_AVAILABLE(macos(12.3))
 @property (nonatomic, assign) BOOL startFailed;
 @end
 
-<<<<<<< HEAD
-@implementation MacRecorderDelegate
-- (void)recordingDidStart {
-    NSLog(@"[mac_recorder] ScreenCaptureKit recording started");
-}
-- (void)recordingDidFinish:(NSURL *)outputURL error:(NSError *)error {
-    if (error) {
-        NSLog(@"[mac_recorder] ScreenCaptureKit recording finished with error: %@", error.localizedDescription);
-    } else {
-        NSLog(@"[mac_recorder] ScreenCaptureKit recording finished OK → %@", outputURL.path);
-    }
-    if (self.completionHandler) {
-        self.completionHandler(outputURL, error);
-=======
 @implementation SCKRecorderDelegate
 
 // Standard SCStreamDelegate method - should be called automatically
@@ -67,7 +46,6 @@ API_AVAILABLE(macos(12.3))
     NSLog(@"🛑 Stream stopped with error: %@", error ? error.localizedDescription : @"none");
     if (self.completionHandler) {
         self.completionHandler(self.outputURL, error);
->>>>>>> screencapture
     }
 }
 
@@ -142,15 +120,6 @@ API_AVAILABLE(macos(12.3))
 
 @end
 
-<<<<<<< HEAD
-// Global state for recording
-static MacRecorderDelegate *g_delegate = nil;
-static bool g_isRecording = false;
-
-// Helper function to cleanup recording resources
-void cleanupRecording() {
-    g_delegate = nil;
-=======
 // Global state for ScreenCaptureKit recording
 static SCStream *g_scStream = nil;
 static SCKRecorderDelegate *g_scDelegate = nil;
@@ -201,7 +170,6 @@ void cleanupSCKRecording() {
         }
         g_scDelegate = nil;
     }
->>>>>>> screencapture
     g_isRecording = false;
 }
 
@@ -246,31 +214,13 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
     NSLog(@"✅ Screen recording permission verified");
     
     std::string outputPath = info[0].As<Napi::String>().Utf8Value();
-    NSLog(@"[mac_recorder] StartRecording: output=%@", [NSString stringWithUTF8String:outputPath.c_str()]);
     
-<<<<<<< HEAD
-    // Options parsing (shared)
-    CGRect captureRect = CGRectNull;
-    bool captureCursor = false; // Default olarak cursor gizli
-    bool includeMicrophone = false; // Default olarak mikrofon kapalı
-    bool includeSystemAudio = true; // Default olarak sistem sesi açık
-    CGDirectDisplayID displayID = CGMainDisplayID(); // Default ana ekran
-    NSString *audioDeviceId = nil; // Default audio device ID
-    NSString *systemAudioDeviceId = nil; // System audio device ID
-    bool forceUseSC = false;
-    // Exclude options for ScreenCaptureKit (optional, backward compatible)
-    NSMutableArray<NSString*> *excludedAppBundleIds = [NSMutableArray array];
-    NSMutableArray<NSNumber*> *excludedPIDs = [NSMutableArray array];
-    NSMutableArray<NSNumber*> *excludedWindowIds = [NSMutableArray array];
-    bool autoExcludeSelf = false;
-=======
     // Default options
     bool captureCursor = false;
     bool includeSystemAudio = true;
     CGDirectDisplayID displayID = 0; // Will be set to first available display
     uint32_t windowID = 0;
     CGRect captureRect = CGRectNull;
->>>>>>> screencapture
     
     // Parse options
     if (info.Length() > 1 && info[1].IsObject()) {
@@ -285,53 +235,6 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
             includeSystemAudio = options.Get("includeSystemAudio").As<Napi::Boolean>();
         }
         
-<<<<<<< HEAD
-        // System audio device ID
-        if (options.Has("systemAudioDeviceId") && !options.Get("systemAudioDeviceId").IsNull()) {
-            std::string sysDeviceId = options.Get("systemAudioDeviceId").As<Napi::String>().Utf8Value();
-            systemAudioDeviceId = [NSString stringWithUTF8String:sysDeviceId.c_str()];
-        }
-
-        // ScreenCaptureKit toggle (optional)
-        if (options.Has("useScreenCaptureKit")) {
-            forceUseSC = options.Get("useScreenCaptureKit").As<Napi::Boolean>();
-        }
-
-        // Exclusion lists (optional)
-        if (options.Has("excludedAppBundleIds") && options.Get("excludedAppBundleIds").IsArray()) {
-            Napi::Array arr = options.Get("excludedAppBundleIds").As<Napi::Array>();
-            for (uint32_t i = 0; i < arr.Length(); i++) {
-                if (!arr.Get(i).IsUndefined() && !arr.Get(i).IsNull()) {
-                    std::string s = arr.Get(i).As<Napi::String>().Utf8Value();
-                    [excludedAppBundleIds addObject:[NSString stringWithUTF8String:s.c_str()]];
-                }
-            }
-        }
-        if (options.Has("excludedPIDs") && options.Get("excludedPIDs").IsArray()) {
-            Napi::Array arr = options.Get("excludedPIDs").As<Napi::Array>();
-            for (uint32_t i = 0; i < arr.Length(); i++) {
-                if (!arr.Get(i).IsUndefined() && !arr.Get(i).IsNull()) {
-                    double v = arr.Get(i).As<Napi::Number>().DoubleValue();
-                    [excludedPIDs addObject:@( (pid_t)v )];
-                }
-            }
-        }
-        if (options.Has("excludedWindowIds") && options.Get("excludedWindowIds").IsArray()) {
-            Napi::Array arr = options.Get("excludedWindowIds").As<Napi::Array>();
-            for (uint32_t i = 0; i < arr.Length(); i++) {
-                if (!arr.Get(i).IsUndefined() && !arr.Get(i).IsNull()) {
-                    double v = arr.Get(i).As<Napi::Number>().DoubleValue();
-                    [excludedWindowIds addObject:@( (uint32_t)v )];
-                }
-            }
-        }
-        if (options.Has("autoExcludeSelf")) {
-            autoExcludeSelf = options.Get("autoExcludeSelf").As<Napi::Boolean>();
-        }
-        
-        // Display ID
-=======
->>>>>>> screencapture
         if (options.Has("displayId") && !options.Get("displayId").IsNull()) {
             uint32_t tempDisplayID = options.Get("displayId").As<Napi::Number>().Uint32Value();
             if (tempDisplayID != 0) {
@@ -356,64 +259,6 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         }
     }
     
-<<<<<<< HEAD
-    @try {
-        // Always prefer ScreenCaptureKit if available
-        NSLog(@"[mac_recorder] Checking ScreenCaptureKit availability");
-        if (@available(macOS 12.3, *)) {
-            if ([ScreenCaptureKitRecorder isScreenCaptureKitAvailable]) {
-            NSMutableDictionary *scConfig = [@{} mutableCopy];
-            scConfig[@"displayId"] = @(displayID);
-            if (!CGRectIsNull(captureRect)) {
-                scConfig[@"captureArea"] = @{ @"x": @(captureRect.origin.x),
-                                               @"y": @(captureRect.origin.y),
-                                               @"width": @(captureRect.size.width),
-                                               @"height": @(captureRect.size.height) };
-            }
-            scConfig[@"captureCursor"] = @(captureCursor);
-            scConfig[@"includeMicrophone"] = @(includeMicrophone);
-            scConfig[@"includeSystemAudio"] = @(includeSystemAudio);
-            if (excludedAppBundleIds.count) scConfig[@"excludedAppBundleIds"] = excludedAppBundleIds;
-            if (excludedPIDs.count) scConfig[@"excludedPIDs"] = excludedPIDs;
-            if (excludedWindowIds.count) scConfig[@"excludedWindowIds"] = excludedWindowIds;
-            // Auto exclude current app by PID if requested
-            if (autoExcludeSelf) {
-                pid_t pid = getpid();
-                NSMutableArray *arr = [NSMutableArray arrayWithArray:scConfig[@"excludedPIDs"] ?: @[]];
-                [arr addObject:@(pid)];
-                scConfig[@"excludedPIDs"] = arr;
-            }
-
-            // Output path for SC
-            std::string outputPathStr = info[0].As<Napi::String>().Utf8Value();
-            scConfig[@"outputPath"] = [NSString stringWithUTF8String:outputPathStr.c_str()];
-
-            NSError *scErr = nil;
-            NSLog(@"[mac_recorder] Using ScreenCaptureKit path (displayId=%u)", displayID);
-            
-            // Create and set up delegate
-            g_delegate = [[MacRecorderDelegate alloc] init];
-            
-            BOOL ok = [ScreenCaptureKitRecorder startRecordingWithConfiguration:scConfig delegate:g_delegate error:&scErr];
-            if (ok) {
-                g_isRecording = true;
-                NSLog(@"[mac_recorder] ScreenCaptureKit startRecording → OK");
-                return Napi::Boolean::New(env, true);
-            }
-            NSLog(@"[mac_recorder] ScreenCaptureKit startRecording → FAIL: %@", scErr.localizedDescription);
-            cleanupRecording();
-            return Napi::Boolean::New(env, false);
-            }
-        } else {
-            NSLog(@"[mac_recorder] ScreenCaptureKit not available");
-            cleanupRecording();
-            return Napi::Boolean::New(env, false);
-        }
-        
-    } @catch (NSException *exception) {
-        cleanupRecording();
-        return Napi::Boolean::New(env, false);
-=======
     // Create output URL
     NSURL *outputURL = [NSURL fileURLWithPath:[NSString stringWithUTF8String:outputPath.c_str()]];
     NSLog(@"📁 Output URL: %@", outputURL.absoluteString);
@@ -543,13 +388,8 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         
         contentFilter = [[SCContentFilter alloc] initWithDisplay:targetDisplay excludingWindows:excluded];
         NSLog(@"✅ Content filter created for display recording");
->>>>>>> screencapture
     }
     
-<<<<<<< HEAD
-    if (!g_isRecording) {
-        return Napi::Boolean::New(env, false);
-=======
     // Get actual display dimensions for proper video configuration
     CGRect displayBounds = CGDisplayBounds(displayID);
     NSSize videoSize = NSMakeSize(displayBounds.size.width, displayBounds.size.height);
@@ -571,27 +411,9 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         NSLog(@"🔊 Audio configuration: capture=%@, excludeProcess=%@", includeSystemAudio ? @"YES" : @"NO", @"YES");
     } else {
         NSLog(@"⚠️ macOS 13.0+ features not available");
->>>>>>> screencapture
     }
     config.showsCursor = captureCursor;
     
-<<<<<<< HEAD
-    @try {
-        NSLog(@"[mac_recorder] StopRecording called");
-        
-        // Stop ScreenCaptureKit recording
-        NSLog(@"[mac_recorder] Stopping ScreenCaptureKit stream");
-        if (@available(macOS 12.3, *)) {
-            [ScreenCaptureKitRecorder stopRecording];
-        }
-        g_isRecording = false;
-        cleanupRecording();
-        NSLog(@"[mac_recorder] ScreenCaptureKit stopped");
-        return Napi::Boolean::New(env, true);
-        
-    } @catch (NSException *exception) {
-        cleanupRecording();
-=======
     if (!CGRectIsNull(captureRect)) {
         config.sourceRect = captureRect;
         // Update video size if capture rect is specified
@@ -611,7 +433,6 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
     
     if (writerError) {
         NSLog(@"❌ Failed to create asset writer: %@", writerError.localizedDescription);
->>>>>>> screencapture
         return Napi::Boolean::New(env, false);
     }
     
@@ -635,117 +456,6 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
         NSLog(@"❌ Cannot add video input to asset writer");
     }
     
-<<<<<<< HEAD
-    @try {
-        NSMutableArray *devices = [NSMutableArray array];
-        
-        // Use CoreAudio to get audio devices since we're removing AVFoundation
-        AudioObjectPropertyAddress propertyAddress = {
-            kAudioHardwarePropertyDevices,
-            kAudioObjectPropertyScopeGlobal,
-            kAudioObjectPropertyElementMain
-        };
-        
-        UInt32 dataSize = 0;
-        OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
-        if (status != noErr) {
-            return Napi::Array::New(env, 0);
-        }
-        
-        UInt32 deviceCount = dataSize / sizeof(AudioDeviceID);
-        AudioDeviceID *audioDevices = (AudioDeviceID *)malloc(dataSize);
-        
-        status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
-        if (status != noErr) {
-            free(audioDevices);
-            return Napi::Array::New(env, 0);
-        }
-        
-        for (UInt32 i = 0; i < deviceCount; i++) {
-            AudioDeviceID deviceID = audioDevices[i];
-            
-            // Check if device has input streams
-            AudioObjectPropertyAddress streamsAddress = {
-                kAudioDevicePropertyStreams,
-                kAudioDevicePropertyScopeInput,
-                kAudioObjectPropertyElementMain
-            };
-            
-            UInt32 streamsSize = 0;
-            status = AudioObjectGetPropertyDataSize(deviceID, &streamsAddress, 0, NULL, &streamsSize);
-            if (status != noErr || streamsSize == 0) {
-                continue; // Skip output-only devices
-            }
-            
-            // Get device name
-            AudioObjectPropertyAddress nameAddress = {
-                kAudioDevicePropertyDeviceNameCFString,
-                kAudioObjectPropertyScopeGlobal,
-                kAudioObjectPropertyElementMain
-            };
-            
-            CFStringRef deviceNameRef = NULL;
-            UInt32 nameSize = sizeof(CFStringRef);
-            status = AudioObjectGetPropertyData(deviceID, &nameAddress, 0, NULL, &nameSize, &deviceNameRef);
-            
-            NSString *deviceName = @"Unknown Device";
-            if (status == noErr && deviceNameRef) {
-                deviceName = (__bridge NSString *)deviceNameRef;
-            }
-            
-            // Get device UID
-            AudioObjectPropertyAddress uidAddress = {
-                kAudioDevicePropertyDeviceUID,
-                kAudioObjectPropertyScopeGlobal,
-                kAudioObjectPropertyElementMain
-            };
-            
-            CFStringRef deviceUIDRef = NULL;
-            UInt32 uidSize = sizeof(CFStringRef);
-            status = AudioObjectGetPropertyData(deviceID, &uidAddress, 0, NULL, &uidSize, &deviceUIDRef);
-            
-            NSString *deviceUID = [NSString stringWithFormat:@"%u", deviceID];
-            if (status == noErr && deviceUIDRef) {
-                deviceUID = (__bridge NSString *)deviceUIDRef;
-            }
-            
-            // Check if this is the default input device
-            AudioObjectPropertyAddress defaultAddress = {
-                kAudioHardwarePropertyDefaultInputDevice,
-                kAudioObjectPropertyScopeGlobal,
-                kAudioObjectPropertyElementMain
-            };
-            
-            AudioDeviceID defaultDeviceID = kAudioDeviceUnknown;
-            UInt32 defaultSize = sizeof(AudioDeviceID);
-            AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultAddress, 0, NULL, &defaultSize, &defaultDeviceID);
-            
-            BOOL isDefault = (deviceID == defaultDeviceID);
-            
-            [devices addObject:@{
-                @"id": deviceUID,
-                @"name": deviceName,
-                @"manufacturer": @"Unknown",
-                @"isDefault": @(isDefault)
-            }];
-            
-            if (deviceNameRef) CFRelease(deviceNameRef);
-            if (deviceUIDRef) CFRelease(deviceUIDRef);
-        }
-        
-        free(audioDevices);
-        
-        // Convert to NAPI array
-        Napi::Array result = Napi::Array::New(env, devices.count);
-        for (NSUInteger i = 0; i < devices.count; i++) {
-            NSDictionary *device = devices[i];
-            Napi::Object deviceObj = Napi::Object::New(env);
-            deviceObj.Set("id", Napi::String::New(env, [device[@"id"] UTF8String]));
-            deviceObj.Set("name", Napi::String::New(env, [device[@"name"] UTF8String]));
-            deviceObj.Set("manufacturer", Napi::String::New(env, [device[@"manufacturer"] UTF8String]));
-            deviceObj.Set("isDefault", Napi::Boolean::New(env, [device[@"isDefault"] boolValue]));
-            result[i] = deviceObj;
-=======
     // Audio input settings (if needed)
     if (includeSystemAudio) {
         NSDictionary *audioSettings = @{
@@ -785,7 +495,6 @@ Napi::Value StartRecording(const Napi::CallbackInfo& info) {
             NSLog(@"✅ Audio output attached to SCStream");
         } else {
             NSLog(@"⚠️ Failed to attach audio output to SCStream (audio may be disabled): %@", outputError.localizedDescription);
->>>>>>> screencapture
         }
     }
     
@@ -950,19 +659,6 @@ Napi::Value GetWindows(const Napi::CallbackInfo& info) {
 Napi::Value CheckPermissions(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     
-<<<<<<< HEAD
-    @try {
-        // Check screen recording permission using ScreenCaptureKit
-        bool hasScreenPermission = true;
-        
-        if (@available(macOS 12.3, *)) {
-            // Try to get shareable content to test ScreenCaptureKit permissions
-            @try {
-                SCShareableContent *content = [SCShareableContent currentShareableContent];
-                hasScreenPermission = (content != nil && content.displays.count > 0);
-            } @catch (NSException *exception) {
-                hasScreenPermission = false;
-=======
     // Check screen recording permission
     bool hasPermission = CGPreflightScreenCaptureAccess();
     
@@ -1032,41 +728,8 @@ Napi::Value GetAudioDevices(const Napi::CallbackInfo& info) {
                 
                 devices.Set(index++, deviceObj);
                 CFRelease(deviceName);
->>>>>>> screencapture
-            }
-        } else {
-            // Fallback for older macOS versions
-            if (@available(macOS 10.15, *)) {
-                // Try to create a display stream to test permissions
-                CGDisplayStreamRef stream = CGDisplayStreamCreate(
-                    CGMainDisplayID(), 
-                    1, 1, 
-                    kCVPixelFormatType_32BGRA, 
-                    nil, 
-                    ^(CGDisplayStreamFrameStatus status, uint64_t displayTime, IOSurfaceRef frameSurface, CGDisplayStreamUpdateRef updateRef) {
-                        // Empty handler
-                    }
-                );
-                
-                if (stream) {
-                    CFRelease(stream);
-                    hasScreenPermission = true;
-                } else {
-                    hasScreenPermission = false;
-                }
             }
         }
-<<<<<<< HEAD
-        
-        // For audio permission, we'll use a simpler check since we're using CoreAudio
-        bool hasAudioPermission = true;
-        
-        return Napi::Boolean::New(env, hasScreenPermission && hasAudioPermission);
-        
-    } @catch (NSException *exception) {
-        return Napi::Boolean::New(env, false);
-=======
->>>>>>> screencapture
     }
     
     free(audioDevices);
@@ -1075,29 +738,6 @@ Napi::Value GetAudioDevices(const Napi::CallbackInfo& info) {
 
 // Initialize the addon
 Napi::Object Init(Napi::Env env, Napi::Object exports) {
-<<<<<<< HEAD
-    exports.Set(Napi::String::New(env, "startRecording"), Napi::Function::New(env, StartRecording));
-    exports.Set(Napi::String::New(env, "stopRecording"), Napi::Function::New(env, StopRecording));
-
-    exports.Set(Napi::String::New(env, "getAudioDevices"), Napi::Function::New(env, GetAudioDevices));
-    exports.Set(Napi::String::New(env, "getDisplays"), Napi::Function::New(env, GetDisplays));
-    exports.Set(Napi::String::New(env, "getWindows"), Napi::Function::New(env, GetWindows));
-    exports.Set(Napi::String::New(env, "getRecordingStatus"), Napi::Function::New(env, GetRecordingStatus));
-    exports.Set(Napi::String::New(env, "checkPermissions"), Napi::Function::New(env, CheckPermissions));
-    // ScreenCaptureKit availability (optional for clients)
-    exports.Set(Napi::String::New(env, "isScreenCaptureKitAvailable"), Napi::Function::New(env, [](const Napi::CallbackInfo& info){
-        Napi::Env env = info.Env();
-        if (@available(macOS 12.3, *)) {
-            bool available = [ScreenCaptureKitRecorder isScreenCaptureKitAvailable];
-            return Napi::Boolean::New(env, available);
-        }
-        return Napi::Boolean::New(env, false);
-    }));
-    
-    // Thumbnail functions
-    exports.Set(Napi::String::New(env, "getWindowThumbnail"), Napi::Function::New(env, GetWindowThumbnail));
-    exports.Set(Napi::String::New(env, "getDisplayThumbnail"), Napi::Function::New(env, GetDisplayThumbnail));
-=======
     exports.Set("startRecording", Napi::Function::New(env, StartRecording));
     exports.Set("stopRecording", Napi::Function::New(env, StopRecording));
     exports.Set("isRecording", Napi::Function::New(env, IsRecording));
@@ -1105,7 +745,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
     exports.Set("getWindows", Napi::Function::New(env, GetWindows));
     exports.Set("checkPermissions", Napi::Function::New(env, CheckPermissions));
     exports.Set("getAudioDevices", Napi::Function::New(env, GetAudioDevices));
->>>>>>> screencapture
     
     // Initialize cursor tracker
     InitCursorTracker(env, exports);

package/src/screen_capture.mm

@@ -1,9 +1,6 @@
-<<<<<<< HEAD
-=======
 #import "screen_capture.h"
 #import <ScreenCaptureKit/ScreenCaptureKit.h>
 #import <AVFoundation/AVFoundation.h>
->>>>>>> screencapture
 #import <CoreGraphics/CoreGraphics.h>
 #import <AppKit/AppKit.h>
 
@@ -77,11 +74,7 @@
     NSURL *fileURL = [NSURL fileURLWithPath:filePath];
     CGImageDestinationRef destination = CGImageDestinationCreateWithURL(
         (__bridge CFURLRef)fileURL, 
-<<<<<<< HEAD
-        CFSTR("public.png"),
-=======
         (__bridge CFStringRef)@"public.png", 
->>>>>>> screencapture
         1, 
         NULL
     );
@@ -110,14 +103,6 @@
 
 + (CGImageRef)createScreenshotFromDisplay:(CGDirectDisplayID)displayID 
                                      rect:(CGRect)rect {
-<<<<<<< HEAD
-    if (CGRectIsNull(rect)) {
-        // Capture entire display
-        return CGDisplayCreateImage(displayID);
-    } else {
-        // Capture specific rect
-        return CGDisplayCreateImageForRect(displayID, rect);
-=======
     if (CGRectIsNull(rect) || CGRectIsEmpty(rect)) {
         rect = CGDisplayBounds(displayID);
     }
@@ -156,7 +141,6 @@ Napi::Value GetAvailableDisplays(const Napi::CallbackInfo& info) {
         displayObj.Set("isPrimary", Napi::Boolean::New(env, [[displayInfo objectForKey:@"isPrimary"] boolValue]));
         
         displaysArray.Set(static_cast<uint32_t>(i), displayObj);
->>>>>>> screencapture
     }
     
     return displaysArray;

package/test-sck.js

@@ -1,55 +1,3 @@
-<<<<<<< HEAD
-const nativeBinding = require('./build/Release/mac_recorder.node');
-
-console.log('=== ScreenCaptureKit Migration Test ===');
-console.log('ScreenCaptureKit available:', nativeBinding.isScreenCaptureKitAvailable());
-console.log('Displays:', nativeBinding.getDisplays().length);
-console.log('Audio devices:', nativeBinding.getAudioDevices().length);
-console.log('Permissions OK:', nativeBinding.checkPermissions());
-
-const displays = nativeBinding.getDisplays();
-console.log('\nDisplay info:', displays[0]);
-
-const audioDevices = nativeBinding.getAudioDevices();
-console.log('\nFirst audio device:', audioDevices[0]);
-
-// Test starting and stopping recording
-console.log('\n=== Recording Test ===');
-const outputPath = '/tmp/test-recording-sck.mov';
-
-try {
-    console.log('Starting recording...');
-    const success = nativeBinding.startRecording(outputPath, {
-        displayId: displays[0].id,
-        captureCursor: true,
-        includeMicrophone: false,
-        includeSystemAudio: false
-    });
-    
-    console.log('Recording started:', success);
-    
-    if (success) {
-        setTimeout(() => {
-            console.log('Stopping recording...');
-            const stopped = nativeBinding.stopRecording();
-            console.log('Recording stopped:', stopped);
-            
-            // Check if file was created
-            const fs = require('fs');
-            setTimeout(() => {
-                if (fs.existsSync(outputPath)) {
-                    const stats = fs.statSync(outputPath);
-                    console.log(`Recording file created: ${outputPath} (${stats.size} bytes)`);
-                } else {
-                    console.log('Recording file not found');
-                }
-            }, 1000);
-        }, 3000); // Record for 3 seconds
-    }
-} catch (error) {
-    console.error('Recording test failed:', error.message);
-}
-=======
 const MacRecorder = require('./index');
 
 function testScreenCaptureKit() {
@@ -105,5 +53,4 @@ function testScreenCaptureKit() {
     }
 }
 
-testScreenCaptureKit();
->>>>>>> screencapture
+testScreenCaptureKit();

package/scripts/test-exclude.js

@@ -1,72 +0,0 @@
-/*
- Simple test runner: starts a 2s recording with ScreenCaptureKit and exclusions.
- */
-const fs = require("fs");
-const path = require("path");
-const MacRecorder = require("..");
-
-async function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-async function main() {
-	const recorder = new MacRecorder();
-	const outDir = path.resolve(process.cwd(), "test-output");
-	const outPath = path.join(outDir, `sc-exclude-${Date.now()}.mov`);
-	await fs.promises.mkdir(outDir, { recursive: true });
-
-	console.log("[TEST] Starting 2s recording with SC exclusions...");
-	// Try to ensure overlays are not active in this process
-
-	const perms = await recorder.checkPermissions();
-	if (!perms?.screenRecording) {
-		console.error(
-			"[TEST] Screen Recording permission is not granted. Enable it in System Settings → Privacy & Security → Screen Recording for Terminal/Node, then re-run."
-		);
-		process.exit(1);
-	}
-
-	try {
-		await recorder.startRecording(outPath, {
-			useScreenCaptureKit: true,
-			captureCursor: false,
-			excludedAppBundleIds: ["com.apple.Safari"],
-		});
-	} catch (e) {
-		console.error("[TEST] Failed to start recording:", e.message);
-		process.exit(1);
-	}
-
-	await sleep(2000);
-
-	try {
-		const result = await recorder.stopRecording();
-		console.log("[TEST] Stopped. Result:", result);
-	} catch (e) {
-		console.error("[TEST] Failed to stop recording:", e.message);
-		process.exit(1);
-	}
-
-	// SCRecordingOutput write may be async; wait up to 10s for the file
-	const deadline = Date.now() + 10000;
-	let stats = null;
-	while (Date.now() < deadline) {
-		if (fs.existsSync(outPath)) {
-			stats = fs.statSync(outPath);
-			if (stats.size > 0) break;
-		}
-		await sleep(200);
-	}
-
-	if (stats && fs.existsSync(outPath)) {
-		console.log(`[TEST] Output saved: ${outPath} (${stats.size} bytes)`);
-	} else {
-		console.error("[TEST] Output file not found or empty:", outPath);
-		process.exit(1);
-	}
-}
-
-main().catch((e) => {
-	console.error("[TEST] Unhandled error:", e);
-	process.exit(1);
-});

package/src/screen_capture_kit.mm

@@ -1,222 +0,0 @@
-#import "screen_capture_kit.h"
-#import <ScreenCaptureKit/ScreenCaptureKit.h>
-#import <AVFoundation/AVFoundation.h>
-
-static SCStream *g_scStream = nil;
-static SCRecordingOutput *g_scRecordingOutput = nil;
-static NSURL *g_outputURL = nil;
-static ScreenCaptureKitRecorder *g_scDelegate = nil;
-static NSArray<SCRunningApplication *> *g_appsToExclude = nil;
-static NSArray<SCWindow *> *g_windowsToExclude = nil;
-
-@interface ScreenCaptureKitRecorder () <SCRecordingOutputDelegate>
-@end
-
-@implementation ScreenCaptureKitRecorder
-
-+ (BOOL)isScreenCaptureKitAvailable {
-    if (@available(macOS 14.0, *)) {
-        Class streamClass = NSClassFromString(@"SCStream");
-        Class recordingOutputClass = NSClassFromString(@"SCRecordingOutput");
-        return (streamClass != nil && recordingOutputClass != nil);
-    }
-    return NO;
-}
-
-+ (BOOL)isRecording {
-    return g_scStream != nil;
-}
-
-+ (BOOL)startRecordingWithConfiguration:(NSDictionary *)config 
-                               delegate:(id)delegate 
-                                  error:(NSError **)error {
-    if (![self isScreenCaptureKitAvailable]) {
-        if (error) {
-            *error = [NSError errorWithDomain:@"ScreenCaptureKitRecorder"
-                                         code:-1
-                                     userInfo:@{NSLocalizedDescriptionKey: @"ScreenCaptureKit not available"}];
-        }
-        return NO;
-    }
-
-    if (g_scStream) {
-        return NO;
-    }
-
-    @try {
-        SCShareableContent *content = nil;
-        if (@available(macOS 13.0, *)) {
-            NSLog(@"[SCK] Fetching shareable content...");
-            content = [SCShareableContent currentShareableContent];
-        }
-        if (!content) {
-            if (error) { *error = [NSError errorWithDomain:@"ScreenCaptureKitRecorder" code:-2 userInfo:@{NSLocalizedDescriptionKey:@"Failed to get shareable content"}]; }
-            NSLog(@"[SCK] Failed to get shareable content");
-            return NO;
-        }
-
-        NSNumber *displayIdNumber = config[@"displayId"]; // CGDirectDisplayID
-        NSDictionary *captureArea = config[@"captureArea"]; // {x,y,width,height}
-        NSNumber *captureCursorNum = config[@"captureCursor"];
-        NSNumber *includeMicNum = config[@"includeMicrophone"];
-        NSNumber *includeSystemAudioNum = config[@"includeSystemAudio"];
-        NSArray<NSString *> *excludedBundleIds = config[@"excludedAppBundleIds"];
-        NSArray<NSNumber *> *excludedPIDs = config[@"excludedPIDs"];
-        NSArray<NSNumber *> *excludedWindowIds = config[@"excludedWindowIds"];
-        NSString *outputPath = config[@"outputPath"];
-
-        SCDisplay *targetDisplay = nil;
-        if (displayIdNumber) {
-            uint32_t wanted = (uint32_t)displayIdNumber.unsignedIntValue;
-            for (SCDisplay *d in content.displays) {
-                if (d.displayID == wanted) { targetDisplay = d; break; }
-            }
-        }
-        if (!targetDisplay) {
-            targetDisplay = content.displays.firstObject;
-            if (!targetDisplay) { NSLog(@"[SCK] No displays found"); return NO; }
-        }
-        NSLog(@"[SCK] Using displayID=%u", targetDisplay.displayID);
-
-        NSMutableArray<SCRunningApplication*> *appsToExclude = [NSMutableArray array];
-        if (excludedBundleIds.count > 0) {
-            for (SCRunningApplication *app in content.applications) {
-                if ([excludedBundleIds containsObject:app.bundleIdentifier]) {
-                    [appsToExclude addObject:app];
-                }
-            }
-        }
-        if (excludedPIDs.count > 0) {
-            for (SCRunningApplication *app in content.applications) {
-                if ([excludedPIDs containsObject:@(app.processID)]) {
-                    [appsToExclude addObject:app];
-                }
-            }
-        }
-
-        NSMutableArray<SCWindow*> *windowsToExclude = [NSMutableArray array];
-        if (excludedWindowIds.count > 0) {
-            for (SCWindow *w in content.windows) {
-                if ([excludedWindowIds containsObject:@(w.windowID)]) {
-                    [windowsToExclude addObject:w];
-                }
-            }
-        }
-
-        // Keep strong references to excluded items for the lifetime of the stream
-        g_appsToExclude = [appsToExclude copy];
-        g_windowsToExclude = [windowsToExclude copy];
-
-        SCContentFilter *filter = nil;
-        if (appsToExclude.count > 0) {
-            if (@available(macOS 13.0, *)) {
-                filter = [[SCContentFilter alloc] initWithDisplay:targetDisplay excludingApplications:(g_appsToExclude ?: @[]) exceptingWindows:(g_windowsToExclude ?: @[])];
-            }
-        }
-        if (!filter) {
-            if (@available(macOS 13.0, *)) {
-                filter = [[SCContentFilter alloc] initWithDisplay:targetDisplay excludingWindows:(g_windowsToExclude ?: @[])];
-            }
-        }
-        if (!filter) { NSLog(@"[SCK] Failed to create filter"); return NO; }
-
-        SCStreamConfiguration *cfg = [[SCStreamConfiguration alloc] init];
-        if (captureArea && captureArea[@"width"] && captureArea[@"height"]) {
-            CGRect displayFrame = targetDisplay.frame;
-            double x = [captureArea[@"x"] doubleValue];
-            double yBottom = [captureArea[@"y"] doubleValue];
-            double w = [captureArea[@"width"] doubleValue];
-            double h = [captureArea[@"height"] doubleValue];
-
-            // Convert bottom-left origin (used by legacy path) to top-left for SC
-            double y = displayFrame.size.height - yBottom - h;
-
-            // Clamp to display bounds to avoid invalid sourceRect
-            if (w < 1) w = 1; if (h < 1) h = 1;
-            if (x < 0) x = 0; if (y < 0) y = 0;
-            if (x + w > displayFrame.size.width) w = MAX(1, displayFrame.size.width - x);
-            if (y + h > displayFrame.size.height) h = MAX(1, displayFrame.size.height - y);
-
-            CGRect src = CGRectMake(x, y, w, h);
-            cfg.sourceRect = src;
-            cfg.width = (int)src.size.width;
-            cfg.height = (int)src.size.height;
-        } else {
-            CGRect displayFrame = targetDisplay.frame;
-            cfg.width = (int)displayFrame.size.width;
-            cfg.height = (int)displayFrame.size.height;
-        }
-        cfg.showsCursor = captureCursorNum.boolValue;
-        if (includeMicNum || includeSystemAudioNum) {
-            if (@available(macOS 13.0, *)) {
-                cfg.capturesAudio = YES;
-            }
-        }
-
-        if (@available(macOS 15.0, *)) {
-            g_scStream = [[SCStream alloc] initWithFilter:filter configuration:cfg delegate:nil];
-            NSLog(@"[SCK] Stream created. w=%d h=%d cursor=%@ audio=%@", cfg.width, cfg.height, cfg.showsCursor?@"YES":@"NO", (@available(macOS 13.0, *) ? (cfg.capturesAudio?@"YES":@"NO") : @"N/A"));
-
-            SCRecordingOutputConfiguration *recCfg = [[SCRecordingOutputConfiguration alloc] init];
-            g_outputURL = [NSURL fileURLWithPath:outputPath];
-            recCfg.outputURL = g_outputURL;
-            recCfg.outputFileType = AVFileTypeQuickTimeMovie;
-
-            id<SCRecordingOutputDelegate> delegateObject = (id<SCRecordingOutputDelegate>)delegate;
-            if (!delegateObject) {
-                if (!g_scDelegate) {
-                    g_scDelegate = [[ScreenCaptureKitRecorder alloc] init];
-                }
-                delegateObject = (id<SCRecordingOutputDelegate>)g_scDelegate;
-            }
-            g_scRecordingOutput = [[SCRecordingOutput alloc] initWithConfiguration:recCfg delegate:delegateObject];
-
-            NSError *addErr = nil;
-            BOOL added = [g_scStream addRecordingOutput:g_scRecordingOutput error:&addErr];
-            if (!added) {
-                NSLog(@"[SCK] addRecordingOutput failed: %@", addErr.localizedDescription);
-                if (error) { *error = addErr ?: [NSError errorWithDomain:@"ScreenCaptureKitRecorder" code:-3 userInfo:nil]; }
-                g_scRecordingOutput = nil; g_scStream = nil; g_outputURL = nil;
-                return NO;
-            }
-
-            [g_scStream startCaptureWithCompletionHandler:^(NSError * _Nullable err) {
-                if (err) {
-                    NSLog(@"[SCK] startCapture error: %@", err.localizedDescription);
-                    [g_scStream removeRecordingOutput:g_scRecordingOutput error:nil];
-                    g_scRecordingOutput = nil; g_scStream = nil; g_outputURL = nil;
-                } else {
-                    NSLog(@"[SCK] startCapture OK");
-                }
-            }];
-            // Return immediately; capture will start asynchronously
-            return YES;
-        }
-
-        return NO;
-    } @catch (__unused NSException *ex) {
-        return NO;
-    }
-}
-
-+ (void)stopRecording {
-    if (!g_scStream) { return; }
-    @try {
-        dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-        [g_scStream stopCaptureWithCompletionHandler:^(NSError * _Nullable error) {
-            dispatch_semaphore_signal(sem);
-        }];
-        dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
-    } @catch (__unused NSException *ex) {
-    }
-    if (g_scRecordingOutput) {
-        [g_scStream removeRecordingOutput:g_scRecordingOutput error:nil];
-    }
-    g_scRecordingOutput = nil;
-    g_scStream = nil;
-    g_outputURL = nil;
-}
-
-@end
-
-