fix: address cross-platform test failures and runtime races

Fix preview highlight retries, Tern initialization recovery, Windows quick-fix
paths, Quick Open dismissal, and browser Builder settings.

Stabilize fixture cleanup and asynchronous test assertions, add regression
coverage, and pin Phoenix Pro fixes. Include the existing Node lockfile metadata
update.

Author: abose

src-node/package-lock.json

@@ -1258,7 +1258,9 @@ define(function (require, exports, module) {
                 return;
             }
 
-            if (previousDocument && previousDocument.isDirty) {
+            // A failed initial directory lookup leaves this module without a server.
+            // There is no cached previous file to update until initialization succeeds.
+            if (ternPromise && previousDocument && previousDocument.isDirty) {
                 updateTernFile(previousDocument);
             }
 

src/JSUtils/ScopeManager.js

@@ -346,7 +346,7 @@ define(function (require, exports, module) {
 
     /**
      * Highlight all nodes affected by a CSS rule. Should be called by subclass implementations of
-     * `updateHighlight()`.
+     * `updateHighlight()`. Failed sends can be retried on subsequent cursor activity.
      * @param {string} name The selector whose matched nodes should be highlighted.
      */
     LiveDocument.prototype.highlightRule = function (name) {
@@ -357,7 +357,14 @@ define(function (require, exports, module) {
             return;
         }
         this._lastHighlight = highlight;
-        this.protocol.evaluate("_LD.highlightRule(" + JSON.stringify(name) + ", " + keepSelection + ")");
+        this.protocol.evaluate("_LD.highlightRule(" + JSON.stringify(name) + ", " + keepSelection + ")")
+            .fail(() => {
+                // Attaching an editor can highlight before any preview client connects.
+                // Do not cache a failed send, or clear a newer selector's pending highlight.
+                if (this._lastHighlight === highlight) {
+                    this._lastHighlight = null;
+                }
+            });
     };
 
     /**

src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js

@@ -169,14 +169,13 @@ define(function (require, exports, module) {
             await closeSession();
         });
 
-        async function _deleteFile(relativeFileName) {
-            let deleted = false;
-            FileSystem.getFileForPath(`${testPath}/${relativeFileName}`).unlink(()=>{
-                deleted = true;
-            });
-            await awaitsFor(function () {
-                return deleted;
-            }, "extension interface registration notification");
+        /**
+         * Remove a fixture, tolerating absence and reporting other filesystem errors.
+         * @param {string} relativeFileName Fixture name within the test project.
+         * @return {Promise<void>}
+         */
+        function _deleteFile(relativeFileName) {
+            return SpecRunnerUtils.deletePathAsync(`${testPath}/${relativeFileName}`, true, FileSystem);
         }
 
         async function createAndVerifyFileContents(fileName, firstLineOfContent) {

src/extensions/default/HTMLCodeHints/integ-tests.js

@@ -1456,8 +1456,16 @@ define(function (require, exports, module) {
             return null; // multi-file / multi-edit / create-rename ops - beyond the one-replace contract
         }
         // Compare as decoded platform paths so URI encoding differences can't break the match.
-        var ownUri = this._quickFixClient.uriForPath(filePath);
-        if (PathConverters.uriToPath(uri) !== PathConverters.uriToPath(ownUri)) {
+        const ownUri = this._quickFixClient.uriForPath(filePath);
+        let editPath = PathConverters.uriToPath(uri);
+        let ownPath = PathConverters.uriToPath(ownUri);
+        if (brackets.platform === "win") {
+            // tsserver lowercases drive letters; Phoenix uses the OS-reported uppercase drive.
+            // Normalize only the drive, retaining the rest of the path's case distinctions.
+            editPath = editPath.replace(/^[a-z]:/i, drive => drive.toUpperCase());
+            ownPath = ownPath.replace(/^[a-z]:/i, drive => drive.toUpperCase());
+        }
+        if (editPath !== ownPath) {
             return null; // edit lands in a different file
         }
         var range = edits[0].range;

src/languageTools/DefaultProviders.js

@@ -4,7 +4,9 @@ <h1 class="dialog-title">Phoenix Builder MCP</h1>
         <ul class="nav nav-tabs no-focus" style="margin-bottom: 0;">
             <li class="active"><a href="#builder-settings" data-toggle="tab">Settings</a></li>
             <li><a href="#builder-logs" data-toggle="tab">Console Logs</a></li>
+            {{#mcpOverrideFile}}
             <li><a href="#builder-prod" data-toggle="tab">Production</a></li>
+            {{/mcpOverrideFile}}
         </ul>
     </div>
     <div class="modal-body tab-content">
@@ -62,6 +64,7 @@ <h1 class="dialog-title">Phoenix Builder MCP</h1>
                 <span style="opacity: 0.5;">No logs captured yet.</span>
             </div>
         </div>
+        {{#mcpOverrideFile}}
         <div id="builder-prod" class="tab-pane">
             <p class="dialog-message">
                 MCP is off in production builds. To instrument one, a machine admin drops a dated
@@ -92,6 +95,7 @@ <h1 class="dialog-title">Phoenix Builder MCP</h1>
                 window shows a red <b>Remote Controlled</b> badge in its status bar.
             </p>
         </div>
+        {{/mcpOverrideFile}}
     </div>
     <div class="modal-footer">
         <button class="dialog-button btn primary" data-button-id="ok">Done</button>

src/phoenix-builder/builder-connect-dialog.html

@@ -175,15 +175,17 @@ define(function (require, exports, module) {
         $container.scrollTop($container[0].scrollHeight);
     }
 
+    /** Open Builder settings, including production setup when a native override path is available. */
     function _handlePhoenixBuilderConnect() {
         let url = localStorage.getItem("phoenixBuilderWsUrl") || DEFAULT_WS_URL,
             enabled = localStorage.getItem("phoenixBuilderEnabled") === "true";
 
-        // Ready to run, so the Production tab needs nothing looked up elsewhere.
-        // The path comes from SystemConfigOverride rather than being written out
-        // again here, so the two cannot drift apart.
-        const overrideFile = Phoenix.fs.getTauriPlatformPath(SystemConfigOverride.OVERRIDE_FILE_PATH);
-        const overrideDir = overrideFile.replace(/[/\\][^/\\]+$/, "");
+        // The production override is a native file. Browser apps only have VFS paths,
+        // so they expose connection settings and logs without native setup commands.
+        // Use SystemConfigOverride's path so the instructions stay in sync with its lookup.
+        const overrideFile = Phoenix.isNativeApp
+            ? Phoenix.fs.getTauriPlatformPath(SystemConfigOverride.OVERRIDE_FILE_PATH) : null;
+        const overrideDir = overrideFile ? overrideFile.replace(/[/\\][^/\\]+$/, "") : "";
         const now = new Date();
         const today = now.getFullYear() + "-" +
             String(now.getMonth() + 1).padStart(2, "0") + "-" +

src/phoenix-builder/main.js

@@ -761,11 +761,9 @@ define(function (require, exports, module) {
         initialString = initialString || "";
         initialString = prefix + initialString;
 
-        // If the underlying search field was already torn down (e.g. the bar
-        // was closed via focus-loss but the isOpen flag wasn't updated in
-        // time), fall back to closing cleanly so the caller reopens fresh.
+        // Closing must go through the bar so isOpen and closePromise stay in sync.
         if (!this.searchField || !this.searchField.$input || !this.$searchField || !this.$searchField[0]) {
-            this.isOpen = false;
+            this.close();
             return;
         }
 
@@ -880,7 +878,10 @@ define(function (require, exports, module) {
             resultProvider: this._filterCallback,
             formatter: this._resultsFormatterCallback,
             onCommit: this._handleItemSelect,
-            onHighlight: this._handleItemHighlight
+            onHighlight: this._handleItemHighlight,
+            // PopUpManager can dismiss results without moving focus (e.g. when no
+            // document is open). The destroyed search field cannot keep serving the bar.
+            onDismiss: this.close.bind(this)
         });
 
         // Return files that are non-binary, or binary files that have a custom viewer.

src/search/QuickOpen.js

@@ -66,6 +66,7 @@ define(function (require, exports, module) {
     require("spec/KeybindingManager-integ-test");
     require("spec/LanguageManager-test");
     require("spec/LanguageManager-integ-test");
+    require("spec/LanguageToolsQuickFix-test");
     require("spec/LowLevelFileIO-test");
     require("spec/Metrics-test");
     require("spec/MultiRangeInlineEditor-test");

test/UnitTestSuite.js

@@ -79,7 +79,8 @@ define(function (require, exports, module) {
 
         afterEach(async function () {
             await testWindow.closeAllFiles();
-            expect(DocumentManager.getAllOpenDocuments().length).toBe(0);
+            await awaitsFor(() => DocumentManager.getAllOpenDocuments().length === 0,
+                "background readers to release closed documents");
             DocumentModule.off(".docTest");
         });
 
@@ -229,7 +230,9 @@ define(function (require, exports, module) {
                 refresh.finish("external content");
                 expect(refresh.doc.getText()).toBe("external content");
                 expect(refresh.doc.isDirty).toBeFalse();
-                expect(refresh.doc._refCount).toBe(refresh.initialRefCount);
+                // Refreshing text also starts linting, which temporarily owns a document reference.
+                await awaitsFor(() => refresh.doc._refCount <= refresh.initialRefCount,
+                    "the refresh and background inspection to release their references");
             });
 
             it("should preserve edits made while a disk refresh is pending", async function () {