roku-debug 0.23.16 → 0.24.1

package/dist/debugSession/BrightScriptDebugSession.js

@@ -313,6 +313,13 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             this.sendEvent(new debugadapter_1.BreakpointEvent(eventName, event));
         }
     }
+    /**
+     * A short human-readable identifier for the target device, safe for log and error messages
+     * (never includes credentials like the rceToken)
+     */
+    get deviceLabel() {
+        return util_1.util.getDeviceLabel(this.launchConfiguration.device);
+    }
     get enableDebugProtocol() {
         var _a;
         return (_a = this.launchConfiguration) === null || _a === void 0 ? void 0 : _a.enableDebugProtocol;
@@ -477,9 +484,23 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
     normalizeLaunchConfig(config) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         var _w, _x;
+        //`device` is the canonical way to address the target device; `host` is a deprecated alias.
+        //this is the ONLY place the debugger reads the top-level `host` field: whatever was supplied
+        //is resolved to a concrete device config here, and everything downstream uses `device`.
+        if (!config.device && config.host) {
+            config.device = { host: config.host };
+        }
+        //the deprecated field is now consumed. Delete it so the runtime object matches the resolved
+        //type and nothing downstream (including the configs echoed back to the client) carries it.
+        delete config.host;
+        //an RCE device config without a token picks one up from the environment (the extension
+        //injects ROKU_RCE_TOKEN into this process so the token does not have to travel through the
+        //launch config over DAP). The custom events that echo this config back to the client scrub
+        //the token out again (see Events.ts), so it never rides the DAP wire in either direction.
+        config.device = util_1.util.hydrateRceTokenFromEnv(config.device);
         (_a = config.cwd) !== null && _a !== void 0 ? _a : (config.cwd = process.cwd());
         (_b = config.outDir) !== null && _b !== void 0 ? _b : (config.outDir = (0, FileUtils_1.standardizePath) `${config.cwd}/out`);
-        (_c = config.stagingDir) !== null && _c !== void 0 ? _c : (config.stagingDir = (0, FileUtils_1.standardizePath) `${config.outDir}/.roku-deploy-staging`);
+        (_c = config.stagingDir) !== null && _c !== void 0 ? _c : (config.stagingDir = util_1.util.getStagingDir({ outDir: config.outDir, cwd: config.cwd }));
         (_d = config.componentLibrariesPort) !== null && _d !== void 0 ? _d : (config.componentLibrariesPort = 8080);
         (_e = config.packagePort) !== null && _e !== void 0 ? _e : (config.packagePort = 80);
         (_f = config.remotePort) !== null && _f !== void 0 ? _f : (config.remotePort = 8060);
@@ -505,11 +526,16 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         return config;
     }
     async launchRequest(response, config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const logEnd = this.logger.timeStart('log', '[launchRequest] launch');
         try {
             this.resetSessionState();
             this.launchConfiguration = this.normalizeLaunchConfig(config);
+            //fail fast when the launch config supplied no device addressing at all, rather than
+            //failing later with a confusing dns or connection error for an undefined host
+            if (!this.launchConfiguration.device) {
+                return await this.shutdown(`Launch config does not specify a target device. Please supply the 'device' option (or the deprecated 'host' option).`);
+            }
             this.setupProcessErrorHandlers();
             //prebake some threads for our ProjectManager to use later on (1 for the main project, and 1 for every complib)
             BscProjectWorkerPool_1.bscProjectWorkerPool.preload(1 + ((_c = (_b = (_a = this.launchConfiguration) === null || _a === void 0 ? void 0 : _a.componentLibraries) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0));
@@ -518,12 +544,13 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
                 logging_1.logger.logLevel = this.launchConfiguration.logLevel;
             }
             this.sendLaunchProgress('start', 'Finding device on network');
-            //do a DNS lookup for the host to fix issues with roku rejecting ECP
+            //do a DNS lookup for the host to fix issues with roku rejecting ECP. Only local devices
+            //are addressed by host; other device types (like the Roku Cloud Emulator) pass through unchanged
             try {
-                this.launchConfiguration.host = await util_1.util.dnsLookup(this.launchConfiguration.host);
+                this.launchConfiguration.device = await this.rokuDeploy.withDnsResolvedHost(this.launchConfiguration.device);
             }
             catch (e) {
-                return this.shutdown(`Could not resolve ip address for host '${this.launchConfiguration.host}'`);
+                return this.shutdown(`Could not resolve ip address for host '${this.deviceLabel}'`);
             }
             // fetch device info if not supplied via launch config
             try {
@@ -531,20 +558,20 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
                     this.deviceInfo = roku_deploy_1.rokuDeploy.enhanceDeviceInfo(this.launchConfiguration.deviceInfo);
                 }
                 else {
-                    this.deviceInfo = await roku_deploy_1.rokuDeploy.getDeviceInfo({ host: this.launchConfiguration.host, remotePort: this.launchConfiguration.remotePort, enhance: true, timeout: 4000 });
+                    this.deviceInfo = await roku_deploy_1.rokuDeploy.getDeviceInfo({ device: this.launchConfiguration.device, ecpPort: this.launchConfiguration.remotePort, enhance: true, timeout: 4000 });
                 }
                 if (this.deviceInfo.ecpSettingMode === 'limited') {
-                    return await this.shutdown(`Please ensure 'Settings' > 'System' > 'Advanced system settings' > 'Control by mobile apps' is set to "Enabled" or "Permissive" on your Roku device to allow the debugger to communicate properly. Current mode: Limited (device: ${this.launchConfiguration.host})`);
+                    return await this.shutdown(`To allow the debugger to communicate properly, please ensure on the Roku device that 'Settings' > 'System' > 'Advanced system settings' > 'Control by mobile apps' is set to "Enabled" or "Permissive". Current mode: Limited (device: ${this.deviceLabel})`);
                 }
             }
             catch (e) {
                 if (e instanceof roku_deploy_1.EcpNetworkAccessModeDisabledError) {
-                    return this.shutdown(`Please ensure 'Settings' > 'System' > 'Advanced system settings' > 'Control by mobile apps' is set to "Enabled" or "Permissive" on your Roku device to allow the debugger to communicate properly. Current mode: Disabled (device: ${this.launchConfiguration.host})`);
+                    return this.shutdown(`To allow the debugger to communicate properly, please ensure on the Roku device that 'Settings' > 'System' > 'Advanced system settings' > 'Control by mobile apps' is set to "Enabled" or "Permissive". Current mode: Disabled (device: ${this.deviceLabel})`);
                 }
-                return this.shutdown(`Unable to connect to roku at '${this.launchConfiguration.host}'. Verify the IP address is correct and that the device is powered on and connected to same network as this computer.`);
+                return this.shutdown(`Unable to connect to roku at '${this.deviceLabel}'. Verify the device address is correct and that the device is powered on and reachable.`);
             }
             if (this.deviceInfo && !this.deviceInfo.developerEnabled) {
-                return await this.shutdown(`Developer mode is not enabled for host '${this.launchConfiguration.host}'.`);
+                return await this.shutdown(`Developer mode is not enabled for device '${this.deviceLabel}'.`);
             }
             // everything is ready, send the response to the launch request so the UI can update and configuration can begin
             this.sendResponse(response);
@@ -571,10 +598,10 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             }
             packageEnd();
             if (this.enableDebugProtocol) {
-                util_1.util.log(`Connecting to Roku via the BrightScript debug protocol at ${this.launchConfiguration.host}:${this.launchConfiguration.controlPort}`);
+                util_1.util.log(`Connecting to Roku via the BrightScript debug protocol at ${this.deviceLabel}:${this.launchConfiguration.controlPort}`);
             }
             else {
-                util_1.util.log(`Connecting to Roku via telnet at ${this.launchConfiguration.host}:${this.launchConfiguration.brightScriptConsolePort}`);
+                util_1.util.log(`Connecting to Roku via telnet at ${this.deviceLabel}:${this.launchConfiguration.brightScriptConsolePort}`);
             }
             //activate rendezvous tracking (if enabled). Log the error and move on if it crashes, this shouldn't bring down the session.
             try {
@@ -588,6 +615,15 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             this.sendLaunchProgress('update', 'Connecting to debug server');
             const connectAdapterEnd = this.logger.timeStart('log', 'Connect adapter');
             this.createRokuAdapter(this.rendezvousTracker);
+            // Manipulating complibs on-device autolaunches the dev app and often triggers compile errors,
+            // so if we have at least one installable complib, delete the dev app and any complibs to avoid all that.
+            if ((_j = this.launchConfiguration.componentLibraries) === null || _j === void 0 ? void 0 : _j.some(x => x.install)) {
+                this.sendLaunchProgress('update', 'Removing existing dev app and component libraries');
+                await roku_deploy_1.rokuDeploy.deleteAllSideloadedPlugins({
+                    device: this.launchConfiguration.device,
+                    password: this.launchConfiguration.password
+                });
+            }
             await this.connectRokuAdapter();
             connectAdapterEnd();
             // Capabilities that depend on the adapter or device version. The exception-breakpoint
@@ -615,8 +651,8 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
                 util_1.util.log('Encountered an issue during the launch process');
                 util_1.util.log(e === null || e === void 0 ? void 0 : e.stack);
                 //send any compile errors to the client
-                await ((_j = this.rokuAdapter) === null || _j === void 0 ? void 0 : _j.sendErrors());
-                const message = (e instanceof Exceptions_1.SocketConnectionInUseError) ? e.message : ((_k = e === null || e === void 0 ? void 0 : e.stack) !== null && _k !== void 0 ? _k : e);
+                await ((_k = this.rokuAdapter) === null || _k === void 0 ? void 0 : _k.sendErrors());
+                const message = (e instanceof Exceptions_1.SocketConnectionInUseError) ? e.message : ((_l = e === null || e === void 0 ? void 0 : e.stack) !== null && _l !== void 0 ? _l : e);
                 await this.shutdown(message, true);
             }
             else {
@@ -633,7 +669,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         try {
             await this.runAutomaticSceneGraphCommands(this.launchConfiguration.autoRunSgDebugCommands);
             //press the home button to ensure we're at the home screen
-            await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
+            await this.rokuDeploy.keyPress({ device: this.launchConfiguration.device, key: 'Home', ecpPort: this.launchConfiguration.remotePort });
             //pass the log level down thought the adapter to the RendezvousTracker and ChanperfTracker
             this.rokuAdapter.setConsoleOutput(this.launchConfiguration.consoleOutput);
             //pass along the console output
@@ -649,7 +685,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             }
             this.rokuAdapter.on('device-unresponsive', async (data) => {
                 const stopDebuggerAction = 'Stop Debugger';
-                const message = `Roku device ${this.launchConfiguration.host} is not responding and may not recover.` +
+                const message = `Roku device ${this.deviceLabel} is not responding and may not recover.` +
                     (data.lastCommand ? `\n\nActive command:\n"${util_1.util.truncate(data.lastCommand, 30)}"` : '');
                 this.logger.log(message, data);
                 const response = await this.showPopupMessage(message, 'warn', false, [stopDebuggerAction]);
@@ -697,10 +733,20 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             //profiling supports connecting to the socket BEFORE a channel is published, so go ahead and connect now
             await this.tryProfilingConnectOnStart();
             //all setBreakpoints requests have arrived by this point (configurationDone is the DAP signal
-            //that the client has finished sending configuration). Inject the STOPs and seal zips now.
+            //that the client has finished sending configuration). Validate breakpoints across every project
+            //in one pass (and inject the STOPs for telnet) - validating per project would fail every other
+            //project's breakpoints. Must finish before postfixing renames the complib files.
+            await this.writeBreakpoints();
+            //postfix each complib's own files now (still no zips. those are sealed after cross-project
+            //references are rewritten).
+            await this.postfixComponentLibraries(this.launchConfiguration.componentLibraries);
+            //now that EVERY project (main + all complibs) is postfixed, rewrite cross-project `Library`
+            //references to point at the postfixed file names. Must run before any project zip is sealed.
+            await this.projectManager.applyLibraryReferencePostfixes();
+            //now zip the main project, also zip and upload installable complibs, and start the webserver for non-installed complibs.
             await Promise.all([
-                this.packageMainProject(),
-                this.packageAndHostComponentLibraries(this.launchConfiguration.componentLibraries, this.launchConfiguration.componentLibrariesPort)
+                this.zipMainProject(),
+                this.zipServeAndInstallComponentLibraries(this.launchConfiguration.componentLibraries, this.launchConfiguration.componentLibrariesPort)
             ]);
             this.sendLaunchProgress('update', 'Uploading to Roku');
             await this.publish();
@@ -717,13 +763,13 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             if (!error) {
                 if (this.rokuAdapter.connected) {
                     this.logger.info('Host connection was established before the main public process was completed');
-                    this.logger.log(`deployed to Roku@${this.launchConfiguration.host}`);
+                    this.logger.log(`deployed to Roku@${this.deviceLabel}`);
                 }
                 else {
                     this.logger.info('Main public process was completed but we are still waiting for a connection to the host');
                     this.rokuAdapter.on('connected', (status) => {
                         if (status) {
-                            this.logger.log(`deployed to Roku@${this.launchConfiguration.host}`);
+                            this.logger.log(`deployed to Roku@${this.deviceLabel}`);
                         }
                     });
                 }
@@ -738,7 +784,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
                 //if we are at a breakpoint, continue
                 await this.rokuAdapter.continue();
                 //kill the app on the roku
-                // await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
+                // await this.rokuDeploy.keyPress({ device: this.launchConfiguration.device, key: 'Home', ecpPort: this.launchConfiguration.remotePort });
                 //convert a hostname to an ip address
                 const deepLinkUrl = await util_1.util.resolveUrl(this.launchConfiguration.deepLinkUrl);
                 //send the deep link http request
@@ -764,10 +810,10 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
      * Activate all required functionality for profiling
      */
     async initializeProfiling() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // Initialize PerfettoManager
         this.perfettoManager = new PerfettoManager_1.PerfettoManager({
-            host: this.launchConfiguration.host,
+            device: this.launchConfiguration.device,
             rootDir: this.launchConfiguration.rootDir,
             remotePort: this.launchConfiguration.remotePort,
             ...(_a = this.launchConfiguration.profiling) === null || _a === void 0 ? void 0 : _a.tracing
@@ -798,20 +844,20 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         if (((_c = (_b = this.launchConfiguration.profiling) === null || _b === void 0 ? void 0 : _b.tracing) === null || _c === void 0 ? void 0 : _c.enable) && this.supportsPerfettoTracing) {
             this.logger.info('Enabling perfetto tracing because it is supported by the device and enabled in the launch configuration');
             try {
-                await this.perfettoManager.enableTracing();
+                await ((_e = (_d = this.perfettoManager) === null || _d === void 0 ? void 0 : _d.enableTracing) === null || _e === void 0 ? void 0 : _e.call(_d));
             }
             catch (e) {
                 this.logger.error('Failed to enable perfetto tracing', e);
             }
             //tracing is expicitly DISabled. turn it off
         }
-        else if (((_e = (_d = this.launchConfiguration.profiling) === null || _d === void 0 ? void 0 : _d.tracing) === null || _e === void 0 ? void 0 : _e.enable) === false && this.supportsPerfettoTracing) {
+        else if (((_g = (_f = this.launchConfiguration.profiling) === null || _f === void 0 ? void 0 : _f.tracing) === null || _g === void 0 ? void 0 : _g.enable) === false && this.supportsPerfettoTracing) {
             this.logger.info('Disabling perfetto tracing because it is disabled in the launch configuration');
             //TODO implement a way to disable perfetto tracing on the device
             //tracing was requested but the device firmware does not meet the minimum requirement
         }
-        else if (((_g = (_f = this.launchConfiguration.profiling) === null || _f === void 0 ? void 0 : _f.tracing) === null || _g === void 0 ? void 0 : _g.enable) && !this.supportsPerfettoTracing) {
-            const firmwareVersion = (_j = (_h = this.deviceInfo) === null || _h === void 0 ? void 0 : _h.softwareVersion) !== null && _j !== void 0 ? _j : 'unknown';
+        else if (((_j = (_h = this.launchConfiguration.profiling) === null || _h === void 0 ? void 0 : _h.tracing) === null || _j === void 0 ? void 0 : _j.enable) && !this.supportsPerfettoTracing) {
+            const firmwareVersion = (_l = (_k = this.deviceInfo) === null || _k === void 0 ? void 0 : _k.softwareVersion) !== null && _l !== void 0 ? _l : 'unknown';
             const message = `Perfetto profiling is not available: device firmware ${firmwareVersion} is below the minimum required version (15.2). The Perfetto profiling buttons will not be available during this session.`;
             this.logger.warn(message);
             this.showPopupMessage(message, 'warn').catch(e => this.logger.error('Failed to show Perfetto unavailable notification', e));
@@ -825,17 +871,17 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
      * If profiling was marked "connectOnStart", try connecting right away
      */
     async tryProfilingConnectOnStart() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (((_b = (_a = this.launchConfiguration.profiling) === null || _a === void 0 ? void 0 : _a.tracing) === null || _b === void 0 ? void 0 : _b.connectOnStart) && this.supportsPerfettoTracing) {
             try {
-                await this.perfettoManager.startTracing();
+                await ((_d = (_c = this.perfettoManager) === null || _c === void 0 ? void 0 : _c.startTracing) === null || _d === void 0 ? void 0 : _d.call(_c));
             }
             catch (e) {
                 this.logger.error('Failed to start perfetto tracing on start', e);
             }
         }
-        else if (((_d = (_c = this.launchConfiguration.profiling) === null || _c === void 0 ? void 0 : _c.tracing) === null || _d === void 0 ? void 0 : _d.connectOnStart) && !this.supportsPerfettoTracing) {
-            const firmwareVersion = (_f = (_e = this.deviceInfo) === null || _e === void 0 ? void 0 : _e.softwareVersion) !== null && _f !== void 0 ? _f : 'unknown';
+        else if (((_f = (_e = this.launchConfiguration.profiling) === null || _e === void 0 ? void 0 : _e.tracing) === null || _f === void 0 ? void 0 : _f.connectOnStart) && !this.supportsPerfettoTracing) {
+            const firmwareVersion = (_h = (_g = this.deviceInfo) === null || _g === void 0 ? void 0 : _g.softwareVersion) !== null && _h !== void 0 ? _h : 'unknown';
             const message = `Perfetto profiling is not available: device firmware ${firmwareVersion} is below the minimum required version (15.2). Tracing will not start automatically.`;
             this.logger.warn(message);
             this.showPopupMessage(message, 'warn').catch(e => this.logger.error('Failed to show Perfetto unavailable notification', e));
@@ -915,14 +961,17 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         this.sendEvent(new Events_1.DiagnosticsEvent(diagnostics));
     }
     async publish() {
-        var _a, _b;
+        var _a, _b, _c;
         const uploadingEnd = this.logger.timeStart('log', 'Uploading zip');
         let packageIsPublished = false;
         //delete any currently installed dev channel (if enabled to do so)
         try {
             if (this.launchConfiguration.deleteDevChannelBeforeInstall === true) {
-                await this.rokuDeploy.deleteInstalledChannel({
-                    ...this.launchConfiguration
+                await this.rokuDeploy.deleteDevChannel({
+                    device: this.launchConfiguration.device,
+                    password: this.launchConfiguration.password,
+                    username: this.launchConfiguration.username,
+                    packagePort: this.launchConfiguration.packagePort
                 });
             }
         }
@@ -937,25 +986,28 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         }
         const isConnected = this.rokuAdapter.once('app-ready');
         const options = {
-            ...this.launchConfiguration,
-            //typing fix
-            logLevel: logging_1.LogLevelPriority[this.logger.logLevel],
+            device: this.launchConfiguration.device,
+            password: this.launchConfiguration.password,
+            username: this.launchConfiguration.username,
+            packagePort: this.launchConfiguration.packagePort,
+            ecpPort: this.launchConfiguration.remotePort,
+            //sideload the zip that was already built from the staging folder (or supplied via packagePath)
+            zip: (_c = this.launchConfiguration.packagePath) !== null && _c !== void 0 ? _c : util_1.util.getOutputZipPath({ outDir: this.launchConfiguration.outDir }),
             // enable the debug protocol if true
             remoteDebug: this.enableDebugProtocol,
             //necessary for capturing compile errors from the protocol (has no effect on telnet)
             remoteDebugConnectEarly: false,
             //we don't want to fail if there were compile errors...we'll let our compile error processor handle that
             failOnCompileError: true,
+            //deleting the dev channel (when enabled) was already handled at the start of this function
+            deleteDevChannel: false,
+            //the device was already sent to the home screen during configurationDone
+            close: false,
             //pass any upload form overrides the client may have configured
             packageUploadOverrides: this.launchConfiguration.packageUploadOverrides
         };
-        //if packagePath is specified, use that info instead of outDir and outFile
-        if (this.launchConfiguration.packagePath) {
-            options.outDir = path.dirname(this.launchConfiguration.packagePath);
-            options.outFile = path.basename(this.launchConfiguration.packagePath);
-        }
         //publish the package to the target Roku
-        const publishPromise = this.rokuDeploy.publish(options).then(() => {
+        const publishPromise = this.rokuDeploy.sideload(options).then(() => {
             packageIsPublished = true;
         }).catch(async (e) => {
             var _a, _b;
@@ -1118,7 +1170,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
     }
     async runAutomaticSceneGraphCommands(commands) {
         if (commands) {
-            let connection = new SceneGraphDebugCommandController_1.SceneGraphDebugCommandController(this.launchConfiguration.host, this.launchConfiguration.sceneGraphDebugCommandsPort);
+            let connection = new SceneGraphDebugCommandController_1.SceneGraphDebugCommandController(this.launchConfiguration.device, this.launchConfiguration.sceneGraphDebugCommandsPort);
             try {
                 await connection.connect();
                 for (let command of this.launchConfiguration.autoRunSgDebugCommands) {
@@ -1186,28 +1238,29 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         await this.handleEntryBreakpoint();
     }
     /**
-     * Inject breakpoint STOP statements into the staged main project and create the zip package.
-     * Runs after the DAP `InitializedEvent` so client-side `setBreakpoints` requests have landed
-     * before any STOPs are written to the staged .brs files (telnet path) and before the zip is sealed.
+     * Validate every breakpoint against the staged projects and (telnet only) write STOP statements into the
+     * staged .brs files. Runs after the DAP `InitializedEvent` so client-side `setBreakpoints` requests have
+     * landed before any STOPs are written. Validates the main project and every component library in ONE pass:
+     * a breakpoint is only failed when it can't be placed in any project, so validating per project would fail
+     * every other project's breakpoints. Must complete before `postfixComponentLibraries` renames the complib
+     * files so telnet STOPs are written to the original file names.
      */
-    async packageMainProject() {
-        var _a;
+    async writeBreakpoints() {
         //add breakpoint lines to source files and then publish
         util_1.util.log('Adding stop statements for active breakpoints');
         //validate breakpoints for all debugger types (and write `stop` statements for telnet — decided internally)
-        await this.breakpointManager.validateAndWriteBreakpointsForProject(this.projectManager.mainProject);
+        await this.breakpointManager.validateAndWriteBreakpointsForProjects(this.projectManager.getAllProjects());
+    }
+    /**
+     * Create the main project's zip package (or run the configured packageTask). Must run AFTER
+     * `applyLibraryReferencePostfixes` so any rewritten `Library` statements are included in the zip.
+     */
+    async zipMainProject() {
+        var _a;
         if (this.launchConfiguration.packageTask) {
             util_1.util.log(`Executing task '${this.launchConfiguration.packageTask}' to assemble the app`);
             await this.sendCustomRequest('executeTask', { task: this.launchConfiguration.packageTask });
-            const options = {
-                ...this.launchConfiguration
-            };
-            //if packagePath is specified, use that info instead of outDir and outFile
-            if (this.launchConfiguration.packagePath) {
-                options.outDir = path.dirname(this.launchConfiguration.packagePath);
-                options.outFile = path.basename(this.launchConfiguration.packagePath);
-            }
-            const packagePath = (_a = this.launchConfiguration.packagePath) !== null && _a !== void 0 ? _a : roku_deploy_1.rokuDeploy.getOutputZipFilePath(options);
+            const packagePath = (_a = this.launchConfiguration.packagePath) !== null && _a !== void 0 ? _a : util_1.util.getOutputZipPath({ outDir: this.launchConfiguration.outDir });
             if (!fsExtra.pathExistsSync(packagePath)) {
                 return this.shutdown(`Cancelling debug session. Package does not exist at '${packagePath}'`);
             }
@@ -1223,6 +1276,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
      * @param command name of the command to execute
      */
     async customRequest(command, response, args) {
+        var _a, _b, _c, _d, _e, _f;
         if (command === 'rendezvous.clearHistory') {
             this.rokuAdapter.clearRendezvousHistory();
         }
@@ -1236,11 +1290,11 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             this.emit('popupMessageEventResponse', args);
         }
         else if (command === 'captureHeapSnapshot') {
-            this.perfettoManager.captureHeapSnapshot().catch((e) => this.logger.error('Failed to capture heap snapshot', e));
+            (_b = (_a = this.perfettoManager) === null || _a === void 0 ? void 0 : _a.captureHeapSnapshot) === null || _b === void 0 ? void 0 : _b.call(_a).catch((e) => this.logger.error('Failed to capture heap snapshot', e));
         }
         else if (command === 'startPerfettoTracing') {
             try {
-                await this.perfettoManager.startTracing();
+                await ((_d = (_c = this.perfettoManager) === null || _c === void 0 ? void 0 : _c.startTracing) === null || _d === void 0 ? void 0 : _d.call(_c));
             }
             catch (e) {
                 response.success = false;
@@ -1249,7 +1303,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         }
         else if (command === 'stopPerfettoTracing') {
             try {
-                await this.perfettoManager.stopTracing();
+                await ((_f = (_e = this.perfettoManager) === null || _e === void 0 ? void 0 : _e.stopTracing) === null || _f === void 0 ? void 0 : _f.call(_e));
             }
             catch (e) {
                 response.success = false;
@@ -1291,32 +1345,43 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         await Promise.all(this.projectManager.componentLibraryProjects.map(compLibProject => compLibProject.stage()));
     }
     /**
-     * Inject breakpoint STOPs into the staged complibs, seal their zips, install installable ones,
-     * and start static file hosting. Runs in `configurationDoneRequest` (after `InitializedEvent`)
-     * so client-side `setBreakpoints` requests have landed before the staged .brs files are written
-     * and the zips are sealed.
+     * Postfix each staged complib's own files (rename its `.brs` files with the `__lib<index>` postfix and
+     * rewrite its `uri=` references). Runs in `configurationDoneRequest` AFTER `writeBreakpoints` so any
+     * telnet STOPs have already been written to the original file names. Kept separate from zipping so the
+     * cross-project `Library` reference rewrite can run after EVERY project is postfixed but before any zip
+     * is sealed.
      */
-    async packageAndHostComponentLibraries(componentLibraries, port) {
+    async postfixComponentLibraries(componentLibraries) {
+        if (!componentLibraries || componentLibraries.length === 0) {
+            return;
+        }
+        //postfix each complib's own files in parallel
+        await Promise.all(this.projectManager.componentLibraryProjects.map(compLibProject => compLibProject.postfixFiles()));
+    }
+    /**
+     * Seal every component library's zip, install the installable ones (in order), and start static file
+     * hosting. Must run AFTER `applyLibraryReferencePostfixes` so each zip contains the rewritten `Library`
+     * statements.
+     */
+    async zipServeAndInstallComponentLibraries(componentLibraries, port) {
+        var _a;
         if (!componentLibraries || componentLibraries.length === 0) {
             return;
         }
         const componentLibrariesOutDir = (0, FileUtils_1.standardizePath) `${this.launchConfiguration.outDir}/component-libraries`;
-        // Add breakpoint lines to the staging files and before publishing
-        util_1.util.log('Adding stop statements for active breakpoints in Component Libraries');
-        //validate breakpoints (and write STOPs for telnet), postfix, and zip each complib in parallel — each targets distinct files
-        const packagePromises = this.projectManager.componentLibraryProjects.map(async (compLibProject) => {
-            await this.breakpointManager.validateAndWriteBreakpointsForProject(compLibProject);
-            await compLibProject.postfixFiles();
-            await compLibProject.zipPackage({ retainStagingFolder: true });
-        });
         const needToDeleteComplibs = this.projectManager.componentLibraryProjects.some(x => x.install);
         if (needToDeleteComplibs) {
-            await roku_deploy_1.rokuDeploy.deleteAllComponentLibraries({
-                host: this.launchConfiguration.host,
-                password: this.launchConfiguration.password,
-                username: this.launchConfiguration.username || 'rokudev'
-            });
-        }
+            //deleteAllComponentLibraries pauses compile-error reporting (to swallow deletion-induced errors) and
+            //leaves it paused. Now that deletion is done and we're about to put libraries back on the device, settle
+            //(draining any lingering deletion output) and resume reporting so real install errors are surfaced.
+            await this.deleteAllComponentLibraries();
+        }
+        //zip each complib in parallel
+        const packagePromises = this.projectManager.componentLibraryProjects.map(compLibProject => compLibProject.zipPackage({ retainStagingFolder: true }));
+        //install component libraries strictly in their declared order (which must be dependency order:
+        //a library may only depend on libraries declared before it). Each install is fully awaited before the
+        //next begins, and a failure aborts the launch. Installing out of order, or continuing past a failed
+        //install, leaves the device with dangling `Library` references that fail to compile.
         for (let i = 0; i < this.projectManager.componentLibraryProjects.length; i++) {
             const compLibProject = this.projectManager.componentLibraryProjects[i];
             if (compLibProject.install === true) {
@@ -1326,25 +1391,29 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
                     await this.sendCustomRequest('executeTask', { task: componentLibraries[i].packageTask });
                 }
                 const options = {
-                    host: this.launchConfiguration.host,
+                    device: this.launchConfiguration.device,
                     password: this.launchConfiguration.password,
                     username: this.launchConfiguration.username || 'rokudev',
-                    logLevel: logging_1.LogLevelPriority[this.logger.logLevel],
+                    packagePort: this.launchConfiguration.packagePort,
+                    ecpPort: this.launchConfiguration.remotePort,
+                    zip: (_a = componentLibraries[i].packagePath) !== null && _a !== void 0 ? _a : util_1.util.getOutputZipPath({ outDir: compLibProject.outDir, outFile: compLibProject.outFile }),
                     failOnCompileError: true,
-                    outDir: compLibProject.outDir,
-                    outFile: compLibProject.outFile,
                     appType: 'dcl',
+                    //installing a component library should never close or delete the sideloaded channel
+                    close: false,
+                    deleteDevChannel: false,
                     packageUploadOverrides: componentLibraries[i].packageUploadOverrides || {}
                 };
-                if (componentLibraries[i].packagePath) {
-                    options.outDir = path.dirname(componentLibraries[i].packagePath);
-                    options.outFile = path.basename(componentLibraries[i].packagePath);
-                }
+                util_1.util.log(`Installing component library ${i} (${compLibProject.outFile})`);
                 try {
-                    await roku_deploy_1.rokuDeploy.publish(options);
+                    await roku_deploy_1.rokuDeploy.sideload(options);
+                    util_1.util.log(`Installed component library ${i} (${compLibProject.outFile})`);
                 }
                 catch (error) {
-                    this.logger.error(`Error installing component library ${i}`, error);
+                    //do NOT continue installing further libraries (or publishing the main app) - a failed install
+                    //here means later libraries and the main app would reference a library that isn't on the device
+                    this.logger.error(`Error installing component library ${i} (${compLibProject.outFile})`, error);
+                    throw error;
                 }
             }
         }
@@ -1357,6 +1426,106 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             hostingPromise
         ]);
     }
+    /**
+     * Delete every component library installed on the device.
+     *
+     * A complib can only depend on complibs the user declared BEFORE it, so the user's configured order is already
+     * dependency order. Deleting in the REVERSE of that order therefore deletes each complib before the ones it
+     * depends on, avoiding compile errors entirely. We use that reverse order as the delete priority.
+     *
+     * Anything still installed that the user did NOT configure (e.g. leftovers from a previous session) has no known
+     * order, so we fall back to compile-error tolerance for those: deleting a complib while another still references
+     * it fails with a compile error, which we ignore and retry later (after its dependent is gone). We finish when
+     * every complib is gone, and fail if the only complibs left are ones that can never be deleted.
+     */
+    async deleteAllComponentLibraries() {
+        var _a;
+        const deviceOptions = {
+            device: this.launchConfiguration.device,
+            password: this.launchConfiguration.password,
+            username: this.launchConfiguration.username || 'rokudev'
+        };
+        //The user's configured complibs, in REVERSE declaration order (dependents before their dependencies). A
+        //complib's position here is its delete priority; complibs the user didn't configure aren't in this list.
+        const deletePriority = this.projectManager.componentLibraryProjects
+            .map(complib => complib.outFile)
+            .reverse();
+        //sort key for a complib: its index in `deletePriority`, or Infinity (delete last) if it wasn't configured
+        const priorityOf = (fileName) => {
+            const index = deletePriority.indexOf(fileName);
+            return index === -1 ? Infinity : index;
+        };
+        const maxAttempts = 5;
+        //how many times we've tried to delete each complib, and the ones we've given up on after maxAttempts
+        const attempts = new Map();
+        const failed = new Set();
+        while (true) {
+            //re-fetch the installed complibs after each iteration: deleting one complib can cascade-delete others, so never delete a stale entry
+            const installed = (await roku_deploy_1.rokuDeploy.listSideloadedPlugins(deviceOptions)).filter(x => x.appType === 'dcl');
+            const attemptCount = (complib) => { var _a; return (_a = attempts.get(complib.archiveFileName)) !== null && _a !== void 0 ? _a : 0; };
+            //of the complibs we haven't given up on, pick the next to delete: fewest attempts first (spreads retries
+            //evenly so a dependent gets deleted before we circle back to a complib that previously failed), and among
+            //equal attempts, follow the reverse-configured delete priority (dependents before dependencies).
+            const candidates = installed.filter(complib => !failed.has(complib.archiveFileName));
+            const next = candidates.sort((a, b) => attemptCount(a) - attemptCount(b) ||
+                priorityOf(a.archiveFileName) - priorityOf(b.archiveFileName))[0];
+            //nothing left to try — done if the device is clear, otherwise hard-fail with whatever remains
+            if (!next) {
+                if (installed.length > 0) {
+                    throw new Error(`Failed to delete existing component libraries on device; ${installed.length} still installed: ${installed.map(x => x.archiveFileName).join(', ')}`);
+                }
+                return;
+            }
+            const fileName = next.archiveFileName;
+            attempts.set(fileName, ((_a = attempts.get(fileName)) !== null && _a !== void 0 ? _a : 0) + 1);
+            try {
+                await roku_deploy_1.rokuDeploy.deleteComponentLibrary({ ...deviceOptions, fileName: fileName });
+            }
+            catch (error) {
+                //re-throw anything that isn't a dependency compile error (auth, network, etc.)
+                if (!this.isComponentLibraryDependencyCompileError(error)) {
+                    throw error;
+                }
+                //Deleting a complib that a dependent still references produces a compile error - but the delete may
+                //STILL have succeeded (the device reports both a compile error and 'Delete Succeeded'). If it actually
+                //deleted, treat it as done. Only if it did NOT succeed do we defer and retry it later.
+                if (this.wasComponentLibraryDeleteSuccessful(error)) {
+                    this.logger.trace(`Deleted '${fileName}' (device reported a compile error but the delete succeeded)`);
+                }
+                else {
+                    //another not-yet-deleted complib still depends on this one. Give up on it once it's out of
+                    //attempts; otherwise leave it pending so we retry after its dependents are gone.
+                    if (attempts.get(fileName) >= maxAttempts) {
+                        failed.add(fileName);
+                    }
+                    this.logger.log(`Deferring delete of '${fileName}'; another component library still depends on it`);
+                }
+            }
+            //the Roku doesn't appreciate back-to-back deletes; give it a moment between requests
+            await util_1.util.sleep(10);
+        }
+    }
+    /**
+     * Is this error the device reporting a compile failure (which, during complib deletion, means another
+     * installed complib still references the one we tried to delete)?
+     */
+    isComponentLibraryDependencyCompileError(error) {
+        var _a;
+        const message = `${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : ''}`;
+        return /compile error|compilation failed/i.test(message);
+    }
+    /**
+     * Did the component-library delete actually succeed, even though the device also reported a compile error?
+     * When we delete a complib that a dependent still references, the device reports BOTH a compile error AND a
+     * `Delete Succeeded` message - meaning the complib really was removed. roku-deploy attaches the parsed device
+     * messages (`{ errors, infos, successes }`) to the thrown error as `rokuMessages`; we look for the success there.
+     * Absence of that success message means the delete did NOT happen, so it should be treated as a failure/retry.
+     */
+    wasComponentLibraryDeleteSuccessful(error) {
+        var _a, _b;
+        const successes = (_b = (_a = error === null || error === void 0 ? void 0 : error.rokuMessages) === null || _a === void 0 ? void 0 : _a.successes) !== null && _b !== void 0 ? _b : [];
+        return successes.some(message => /delete succeeded/i.test(message));
+    }
     sourceRequest(response, args) {
         this.logger.log('sourceRequest');
         let old = this.sendResponse;
@@ -1877,7 +2046,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             else if (v.type === '$$Registry') {
                 // This is a special scope variable used to load registry data via an ECP call
                 // Send the registry ECP call for the `dev` app as side loaded apps are always `dev`
-                await (0, ecpRegistryUtils_1.populateVariableFromRegistryEcp)({ host: this.launchConfiguration.host, remotePort: this.launchConfiguration.remotePort, appId: 'dev' }, v, this.variables, this.getEvaluateRefId.bind(this));
+                await (0, ecpRegistryUtils_1.populateVariableFromRegistryEcp)({ remotePort: this.launchConfiguration.remotePort, device: this.launchConfiguration.device, appId: 'dev' }, v, this.variables, this.getEvaluateRefId.bind(this));
             }
         }
         catch (error) {
@@ -2548,14 +2717,14 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
      */
     async disconnectRequest(response, args, request) {
         //return to the home screen — best effort. The device may already be powered off or unreachable
-        //at disconnect time; without a guard pressHomeButton rejects (EHOSTDOWN / ECONNREFUSED / etc)
+        //at disconnect time; without a guard the home key press rejects (EHOSTDOWN / ECONNREFUSED / etc)
         //and because @vscode/debugadapter dispatches this method without awaiting the returned Promise,
         //that rejection escapes as an unhandledRejection and crashes the DAP process.
         //See https://github.com/rokucommunity/vscode-brightscript-language/issues/807
         //    https://github.com/rokucommunity/roku-debug/issues/332
         if (!this.enableDebugProtocol) {
             try {
-                await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
+                await this.rokuDeploy.keyPress({ device: this.launchConfiguration.device, key: 'Home', ecpPort: this.launchConfiguration.remotePort });
             }
             catch (e) {
                 this.logger.warn('Failed to press home button during disconnect; device may be unreachable', e);
@@ -2594,8 +2763,8 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             }
             try {
                 let appStateResult = await RokuECP_1.rokuECP.getAppState({
-                    host: this.launchConfiguration.host,
                     remotePort: this.launchConfiguration.remotePort,
+                    device: this.launchConfiguration.device,
                     appId: 'dev',
                     requestOptions: { timeout: 300 }
                 });
@@ -2606,8 +2775,8 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
                     // If the app supports Instant Resume and is running in the background or the app does not support Instant Resume and is running, sending this command terminates the app.
                     // This means that we might need to send this command twice to terminate the app.
                     await RokuECP_1.rokuECP.exitApp({
-                        host: this.launchConfiguration.host,
                         remotePort: this.launchConfiguration.remotePort,
+                        device: this.launchConfiguration.device,
                         appId: 'dev',
                         requestOptions: { timeout: 300 }
                     });
@@ -2918,9 +3087,12 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             else {
                 const lastId = this.launchProgressId;
                 this.sendEvent(new debugadapter_1.ProgressUpdateEvent(lastId, message));
-                setTimeout(() => {
+                const endTimer = setTimeout(() => { var _a; return (_a = this.flushLaunchProgressEnd) === null || _a === void 0 ? void 0 : _a.call(this); }, 1000); // add a slight delay before ending the progress to improve UX
+                this.flushLaunchProgressEnd = () => {
+                    clearTimeout(endTimer);
+                    this.flushLaunchProgressEnd = undefined;
                     this.sendEvent(new debugadapter_1.ProgressEndEvent(lastId, message));
-                }, 1000); // add a slight delay before ending the progress to improve UX
+                };
                 this.launchProgressId = undefined;
             }
         }
@@ -3001,7 +3173,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         var _a;
         if (this.shutdownPromise === undefined) {
             this.logger.log('[shutdown] Beginning shutdown sequence', errorMessage);
-            //Backstop: if the graceful shutdown hangs (e.g. pressHomeButton against an unreachable
+            //Backstop: if the graceful shutdown hangs (e.g. a home key press against an unreachable
             //device), force-exit anyway so we never leave an orphaned adapter running forever
             const forceExitTimer = setTimeout(() => {
                 this.logger.error('[shutdown] graceful shutdown timed out; forcing exit');
@@ -3018,9 +3190,13 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         return this.shutdownPromise;
     }
     async _shutdown(errorMessage, modal = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         // Ensure any active launch progress bar is dismissed before showing error messages or the terminated event.
         this.sendLaunchProgress('end', 'Complete');
+        // 'end' defers its ProgressEndEvent for UX; deliver it right now (whether from the line above or from an
+        // earlier 'end' whose delay has not elapsed yet) - the adapter exits before a pending timer would fire,
+        // which would leave the client's progress notification stuck open
+        (_a = this.flushLaunchProgressEnd) === null || _a === void 0 ? void 0 : _a.call(this);
         //send the message FIRST before anything else. This improves the chances that the message will be displayed to the user
         try {
             if (errorMessage) {
@@ -3035,13 +3211,13 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         }
         // stop perfetto tracing if it's running
         try {
-            await this.perfettoManager.stopTracing();
+            await ((_c = (_b = this.perfettoManager) === null || _b === void 0 ? void 0 : _b.stopTracing) === null || _c === void 0 ? void 0 : _c.call(_b));
         }
         catch (e) {
             this.logger.error('Error stopping perfetto tracing', e);
         }
         try {
-            await ((_b = (_a = this.perfettoManager) === null || _a === void 0 ? void 0 : _a.dispose) === null || _b === void 0 ? void 0 : _b.call(_a));
+            await ((_e = (_d = this.perfettoManager) === null || _d === void 0 ? void 0 : _d.dispose) === null || _e === void 0 ? void 0 : _e.call(_d));
         }
         catch (e) {
             this.logger.error('Error disposing perfetto manager', e);
@@ -3049,11 +3225,11 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         //close the debugger connection
         try {
             this.logger.log('Destroy rokuAdapter');
-            await ((_d = (_c = this.rokuAdapter) === null || _c === void 0 ? void 0 : _c.destroy) === null || _d === void 0 ? void 0 : _d.call(_c));
+            await ((_g = (_f = this.rokuAdapter) === null || _f === void 0 ? void 0 : _f.destroy) === null || _g === void 0 ? void 0 : _g.call(_f));
             //press the home button to return to the home screen
             try {
                 this.logger.log('Press home button');
-                await this.rokuDeploy.pressHomeButton(this.launchConfiguration.host, this.launchConfiguration.remotePort);
+                await this.rokuDeploy.keyPress({ device: this.launchConfiguration.device, key: 'Home', ecpPort: this.launchConfiguration.remotePort });
             }
             catch (e) {
                 this.logger.error(e);
@@ -3063,25 +3239,25 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
             this.logger.error(e);
         }
         try {
-            (_f = (_e = this.projectManager) === null || _e === void 0 ? void 0 : _e.dispose) === null || _f === void 0 ? void 0 : _f.call(_e);
+            (_j = (_h = this.projectManager) === null || _h === void 0 ? void 0 : _h.dispose) === null || _j === void 0 ? void 0 : _j.call(_h);
         }
         catch (e) {
             this.logger.error(e);
         }
         try {
-            (_g = this.componentLibraryServer) === null || _g === void 0 ? void 0 : _g.stop();
+            (_k = this.componentLibraryServer) === null || _k === void 0 ? void 0 : _k.stop();
         }
         catch (e) {
             this.logger.error(e);
         }
         try {
-            await ((_j = (_h = this.rendezvousTracker) === null || _h === void 0 ? void 0 : _h.destroy) === null || _j === void 0 ? void 0 : _j.call(_h));
+            await ((_m = (_l = this.rendezvousTracker) === null || _l === void 0 ? void 0 : _l.destroy) === null || _m === void 0 ? void 0 : _m.call(_l));
         }
         catch (e) {
             this.logger.error(e);
         }
         try {
-            await ((_l = (_k = this.sourceMapManager) === null || _k === void 0 ? void 0 : _k.destroy) === null || _l === void 0 ? void 0 : _l.call(_k));
+            await ((_p = (_o = this.sourceMapManager) === null || _o === void 0 ? void 0 : _o.destroy) === null || _p === void 0 ? void 0 : _p.call(_o));
         }
         catch (e) {
             this.logger.error(e);
@@ -3089,7 +3265,7 @@ class BrightScriptDebugSession extends debugadapter_1.LoggingDebugSession {
         try {
             //if configured, delete the staging directory
             if (!this.launchConfiguration.retainStagingFolder) {
-                const stagingDirs = (_o = (_m = this.projectManager) === null || _m === void 0 ? void 0 : _m.getStagingDirs()) !== null && _o !== void 0 ? _o : [];
+                const stagingDirs = (_r = (_q = this.projectManager) === null || _q === void 0 ? void 0 : _q.getStagingDirs()) !== null && _r !== void 0 ? _r : [];
                 this.logger.info('deleting staging folders', stagingDirs);
                 for (let stagingDir of stagingDirs) {
                     try {