From 95a9285f02a096fa725f22b70e30e4adc368cbb9 Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Wed, 30 Sep 2026 17:40:03 +0530
Subject: [PATCH 1/8] fix: stabilize desktop tests and asynchronous editor
 updates

---
 .codex/config.toml                            |   3 +
 serve-proxy.js                                |  22 +-
 src-node/index.js                             |  57 ++-
 src/JSUtils/ScopeManager.js                   |  36 +-
 src/editor/MediaViewer.js                     |   9 +-
 .../DocCommentHints/integration-tests.js      |   7 +-
 .../default/HTMLCodeHints/integ-tests.js      |  47 ++-
 src/extensions/default/QuickView/unittests.js |  12 +-
 .../default/TypeScriptSupport/unittests.js    |  33 +-
 src/language/CodeInspection.js                |  39 +-
 src/node-loader.js                            |  32 ++
 src/project/FileSyncManager.js                |  52 ++-
 src/project/ProjectModel.js                   |   6 +-
 test/UnitTestSuite.js                         |   1 +
 test/spec/CodeInspection-fix-integ-test.js    |  62 ++-
 test/spec/Document-integ-test.js              | 369 +++++++++++++++++-
 test/spec/Extn-ESLint-integ-test.js           |  27 +-
 test/spec/Extn-Git-integ-test.js              |  38 +-
 test/spec/LiveDevelopmentMultiBrowser-test.js |   7 +-
 test/spec/ProjectModel-test.js                |  18 +
 test/spec/ScopeManager-integ-test.js          |  99 +++++
 test/spec/SpecRunnerUtils.js                  |  38 ++
 test/spec/md-editor-integ-test.js             |  27 +-
 23 files changed, 923 insertions(+), 118 deletions(-)
 create mode 100644 test/spec/ScopeManager-integ-test.js

diff --git a/.codex/config.toml b/.codex/config.toml
index 4192b15039..16acc3faef 100644
--- a/.codex/config.toml
+++ b/.codex/config.toml
@@ -27,3 +27,6 @@ import(pathToFileURL(path.join(root, entry)).href).catch((error) => {
 env_vars = ["PHOENIX_DESKTOP_PATH", "PHOENIX_MCP_WS_PORT"]
 # Live-preview connection and execution can take longer than the default 60s.
 tool_timeout_sec = 120
+
+[mcp_servers.phoenix-builder.tools.get_phoenix_status]
+approval_mode = "approve"
diff --git a/serve-proxy.js b/serve-proxy.js
index d7a1819902..2e2dbc684d 100644
--- a/serve-proxy.js
+++ b/serve-proxy.js
@@ -309,8 +309,26 @@ const server = http.createServer((req, res) => {
         }
     }
 
-    // Serve static files
-    let filePath = path.join(config.root, parsedUrl.pathname);
+    // Serve static files. url.parse leaves the pathname percent encoded, so a
+    // directory or file whose name contains a space was looked up on disk as
+    // "sub%20dir" and answered 404 even though it was right there. Decode before
+    // touching the filesystem - the traversal check below still runs on the
+    // result, which is what stops an encoded "%2e%2e" from buying anything.
+    let decodedPathname;
+    try {
+        decodedPathname = decodeURIComponent(parsedUrl.pathname);
+    } catch (e) {
+        // A malformed escape is a bad request, not a missing file.
+        res.writeHead(400, { 'Content-Type': 'text/plain' });
+        res.end('Bad Request');
+        return;
+    }
+    if (decodedPathname.indexOf('\0') !== -1) {
+        res.writeHead(400, { 'Content-Type': 'text/plain' });
+        res.end('Bad Request');
+        return;
+    }
+    let filePath = path.join(config.root, decodedPathname);
 
     // Security: prevent directory traversal
     const normalizedPath = path.normalize(filePath);
diff --git a/src-node/index.js b/src-node/index.js
index 5cde37499f..795cd055b3 100644
--- a/src-node/index.js
+++ b/src-node/index.js
@@ -169,17 +169,62 @@ rl.on('close', () => {
     process.exit(1);
 });
 
+// Opt-in watchdog for test processes; disabled by default. node-loader.js arms
+// it for Phoenix.isTestWindow, and SpecRunnerUtils refreshes the runner and its
+// test window. Normal editor sessions never send setIdleExit.
+//
+// Tauri owns this process and holds stdin open after the spawning page goes away.
+// A terminate command sent during beforeunload can be lost, leaving Node and its
+// LSP servers running. Test runs accept timeout-based cleanup for these orphans.
+// Keep this disabled in normal editor sessions: sleep, page suspension or long
+// pauses can stop heartbeats even though the page still exists. Expiry can then
+// trigger a Node crash dialog after wake. Earlier heartbeat/socket orphan checks
+// were removed for sleep-related crashes in a1e660cb5 and ba5800d93.
+let _idleExitMs = 0;
+let _idleExitTimer = null;
+
+function _shutdown(reason) {
+    lmdb.dumpDBToFileAndCloseDB()
+        .catch(console.error)
+        .finally(() => {
+            console.log(reason);
+            process.exit(0);
+        });
+}
+
+function _refreshIdleExit() {
+    if (!_idleExitMs) {
+        return;
+    }
+    if (_idleExitTimer) {
+        clearTimeout(_idleExitTimer);
+    }
+    _idleExitTimer = setTimeout(() => {
+        _shutdown(`No command for ${_idleExitMs}ms, the page that spawned us is gone.`);
+    }, _idleExitMs);
+    // never let this timer alone hold the process up
+    if (_idleExitTimer.unref) {
+        _idleExitTimer.unref();
+    }
+}
+
 function processCommand(line) {
     try{
         let jsonCmd = JSON.parse(line);
+        // any command at all is proof the page is still there
+        _refreshIdleExit();
         switch (jsonCmd.commandCode) {
+        case "setIdleExit":
+            _idleExitMs = Number(jsonCmd.commandData) || 0;
+            if (!_idleExitMs && _idleExitTimer) {
+                clearTimeout(_idleExitTimer);
+                _idleExitTimer = null;
+            }
+            _refreshIdleExit();
+            _sendResponse(_idleExitMs, jsonCmd.commandID);
+            return;
         case "terminate":
-            lmdb.dumpDBToFileAndCloseDB()
-                .catch(console.error)
-                .finally(()=>{
-                    console.log("Node terminated by phcode.");
-                    process.exit(0);
-                });
+            _shutdown("Node terminated by phcode.");
             return;
         case "ping": _sendResponse("pong", jsonCmd.commandID); return;
         case "setDebugMode":
diff --git a/src/JSUtils/ScopeManager.js b/src/JSUtils/ScopeManager.js
index ab6944cac1..c7ecfa1cbd 100644
--- a/src/JSUtils/ScopeManager.js
+++ b/src/JSUtils/ScopeManager.js
@@ -110,20 +110,22 @@ define(function (require, exports, module) {
 
     /**
      *  Init preferences from a file in the project root or builtin
-     *  defaults if no file is found;
+     *  defaults if no file is found. Ignore callbacks from a previous project.
      * @private
      *  @param {string=} projectRootPath - new project root path. Only needed
      *  for unit tests.
      */
     function initPreferences(projectRootPath) {
 
-        // Reject the old preferences if they have not completed.
-        if (deferredPreferences && deferredPreferences.state() === "pending") {
-            deferredPreferences.reject();
+        const previousRequest = deferredPreferences;
+        const request = $.Deferred();
+        deferredPreferences = request;
+        // Cancelling the old request can release queued editor changes. Those
+        // changes must already see the new project's preference request.
+        if (previousRequest && previousRequest.state() === "pending") {
+            previousRequest.reject();
         }
-
-        deferredPreferences = $.Deferred();
-        var pr = ProjectManager.getProjectRoot();
+        const pr = ProjectManager.getProjectRoot();
 
         // Open preferences relative to the project root
         // Normally there is a project root, but for unit tests we need to
@@ -133,6 +135,7 @@ define(function (require, exports, module) {
         } else if (!projectRootPath) {
             console.log("initPreferences: projectRootPath has no value. Using Defaults.");
             preferences = new Preferences();
+            request.resolve();
             return;
         }
 
@@ -140,8 +143,14 @@ define(function (require, exports, module) {
 
         preferences = new Preferences();
         FileSystem.resolve(path, function (err, file) {
+            if (deferredPreferences !== request) {
+                return;
+            }
             if (!err) {
                 FileUtils.readAsText(file).done(function (text) {
+                    if (deferredPreferences !== request) {
+                        return;
+                    }
                     var configObj = null;
                     try {
                         configObj = JSON.parse(text);
@@ -154,13 +163,16 @@ define(function (require, exports, module) {
                         }
                     }
                     preferences = new Preferences(configObj);
-                    deferredPreferences.resolve();
+                    request.resolve();
                 }).fail(function (error) {
+                    if (deferredPreferences !== request) {
+                        return;
+                    }
                     preferences = new Preferences();
-                    deferredPreferences.resolve();
+                    request.resolve();
                 });
             } else {
-                deferredPreferences.resolve();
+                request.resolve();
             }
         });
     }
@@ -1299,6 +1311,10 @@ define(function (require, exports, module) {
                         });
                     });
                 });
+            }).fail(function () {
+                // A project switch cancelled these preferences. Release this
+                // initialization so the next editor change can initialize Tern.
+                addFilesDeferred.resolveWith(null);
             });
         }
 
diff --git a/src/editor/MediaViewer.js b/src/editor/MediaViewer.js
index 82bdbc8ed1..a252fc1c05 100644
--- a/src/editor/MediaViewer.js
+++ b/src/editor/MediaViewer.js
@@ -83,7 +83,14 @@ define(function (require, exports, module) {
      */
     function _mediaStreamURL(file) {
         const platformPath = Phoenix.fs.getTauriPlatformPath(file.fullPath);
-        return window.PhNodeEngine.mediaURL +
+        // The file name rides in the path, before the query that actually names the
+        // file, purely so the URL ends in the right extension. WebKit picks its
+        // media engine for WebM off the URL extension rather than the Content-Type,
+        // so without this a .webm plays as "format not supported" on the Mac
+        // desktop app while the very same bytes play from a blob. mp4 is content
+        // sniffed and so never showed the problem. Node ignores this segment - it
+        // matches the route by prefix and reads platformPath from the query.
+        return window.PhNodeEngine.mediaURL + "/" + encodeURIComponent(file.name) +
             "?platformPath=" + encodeURIComponent(platformPath);
     }
 
diff --git a/src/extensions/default/DocCommentHints/integration-tests.js b/src/extensions/default/DocCommentHints/integration-tests.js
index f7c836473a..978a020b4b 100644
--- a/src/extensions/default/DocCommentHints/integration-tests.js
+++ b/src/extensions/default/DocCommentHints/integration-tests.js
@@ -81,7 +81,12 @@ define(function (require, exports, module) {
                 await awaitsForDone(SpecRunnerUtils.openProjectFiles([tc.file]), "open " + tc.file);
                 const editor = EditorManager.getActiveEditor();
                 editor.setCursorPos(tc.line, tc.ch);
-                CommandManager.execute(Commands.SHOW_CODE_HINTS);
+                // Hand the editor to the command. Left to itself it asks for the
+                // focused editor, and an editor only counts as focused once the
+                // browser has dispatched focus to it - which it does not do while the
+                // test window is behind another app. Then no session starts, no popup
+                // opens, and every case here times out together.
+                CommandManager.execute(Commands.SHOW_CODE_HINTS, editor);
 
                 // 1) the code-hints popup appears with our hint
                 await awaitsFor(function () { return $docHint().length > 0; },
diff --git a/src/extensions/default/HTMLCodeHints/integ-tests.js b/src/extensions/default/HTMLCodeHints/integ-tests.js
index 3c038c0144..a80521f011 100644
--- a/src/extensions/default/HTMLCodeHints/integ-tests.js
+++ b/src/extensions/default/HTMLCodeHints/integ-tests.js
@@ -88,15 +88,23 @@ define(function (require, exports, module) {
             const selected = ProjectManager.getSelectedItem();
             expect(selected.fullPath).toBe(testPath + "/jumpToDef.html");
 
-            let editor = EditorManager.getActiveEditor();
-            editor.setCursorPos({ line: 5, ch: 6 });
+            const hostEditor = EditorManager.getActiveEditor();
+            hostEditor.setCursorPos({ line: 5, ch: 6 });
 
             await awaitsForDone(CommandManager.execute(Commands.NAVIGATE_JUMPTO_DEFINITION),
                 "jump to def on div");
 
-            editor = EditorManager.getFocusedInlineEditor();
-            expect(editor.document.file.fullPath.endsWith("LiveDevelopment-MultiBrowser-test-files/simpleShared.css"))
-                .toBeTrue();
+            // Ask the host for its inline editors rather than for the focused one:
+            // an inline editor only holds focus while the window does, so the old
+            // check came back null whenever the test window was not the OS front
+            // window, without the inline editor being any less open.
+            let inlineEditor;
+            await awaitsFor(function () {
+                inlineEditor = EditorManager.getInlineEditors(hostEditor)[0];
+                return !!inlineEditor;
+            }, "inline editor to open on the definition");
+            expect(inlineEditor.document.file.fullPath
+                .endsWith("LiveDevelopment-MultiBrowser-test-files/simpleShared.css")).toBeTrue();
             await closeSession();
         });
 
@@ -105,14 +113,22 @@ define(function (require, exports, module) {
             const selected = ProjectManager.getSelectedItem();
             expect(selected.fullPath).toBe(testPath + "/jumpToDef.html");
 
-            let editor = EditorManager.getActiveEditor();
-            editor.setCursorPos({ line: 6, ch: 23 });
+            const hostEditor = EditorManager.getActiveEditor();
+            hostEditor.setCursorPos({ line: 6, ch: 23 });
 
             await awaitsForDone(CommandManager.execute(Commands.NAVIGATE_JUMPTO_DEFINITION),
                 "jump to def on div");
 
-            editor = EditorManager.getFocusedInlineEditor();
-            expect(editor.document.file.fullPath.endsWith("LiveDevelopment-MultiBrowser-test-files/sub/test.css"))
+            // Ask the host for its inline editors rather than for the focused one:
+            // an inline editor only holds focus while the window does, so the old
+            // check came back null whenever the test window was not the OS front
+            // window, without the inline editor being any less open.
+            let inlineEditor;
+            await awaitsFor(function () {
+                inlineEditor = EditorManager.getInlineEditors(hostEditor)[0];
+                return !!inlineEditor;
+            }, "inline editor to open on the definition");
+            expect(inlineEditor.document.file.fullPath.endsWith("LiveDevelopment-MultiBrowser-test-files/sub/test.css"))
                 .toBeTrue();
             await closeSession();
         });
@@ -202,9 +218,11 @@ define(function (require, exports, module) {
             let editor = EditorManager.getActiveEditor();
             editor.setCursorPos(cursor);
 
-            await awaitsForDone(CommandManager.execute(Commands.SHOW_CODE_HINTS),
-                "show code hints");
-
+            // The index has to hold the classes before hints are asked for, not after.
+            // Showing hints is a one-shot request: made while the index is still
+            // catching up, the provider has no class hints to offer, no menu opens,
+            // and nothing asks again once the index is ready - so this passed only
+            // when the index happened to be warm, and timed out under a full run.
             await awaitsFor(async function () {
                 for(let hint of expectedSomeHintsArray){
                     const allSelectors = await CSSUtils.getAllCssSelectorsInProject();
@@ -215,6 +233,11 @@ define(function (require, exports, module) {
                 return true;
             }, "CSSUtils project selectors to be updated");
 
+            // With the editor passed in, the session does not depend on it holding
+            // focus, which it does not while the test window is in the background.
+            await awaitsForDone(CommandManager.execute(Commands.SHOW_CODE_HINTS, editor),
+                "show code hints");
+
             await awaitsFor(function () {
                 return $(".codehint-menu").is(":visible");
             }, "codehints to be shown");
diff --git a/src/extensions/default/QuickView/unittests.js b/src/extensions/default/QuickView/unittests.js
index 440b07d94a..22b31b61b4 100644
--- a/src/extensions/default/QuickView/unittests.js
+++ b/src/extensions/default/QuickView/unittests.js
@@ -197,7 +197,17 @@ define(function (require, exports, module) {
                 let quickViewSwatch = popoverInfo.content.find("#quick-view-color-swatch");
                 expect(quickViewSwatch.attr("data-for-test")).toBe(color);
                 quickViewSwatch.click();
-                expect(EditorManager.getFocusedInlineWidget()._color).toBe(color);
+                // Find the color editor among the host's inline widgets rather than as
+                // the focused one: an inline widget only holds focus while the window
+                // does, so the old check came back null when the test window was in
+                // the background, with the color editor open all the same.
+                let colorWidget;
+                await awaitsFor(function () {
+                    colorWidget = EditorManager.getActiveEditor().getInlineWidgets()
+                        .find(function (widget) { return widget._color; });
+                    return !!colorWidget;
+                }, "inline color editor to open");
+                expect(colorWidget._color).toBe(color);
             });
 
             describe("JavaScript file", function () {
diff --git a/src/extensions/default/TypeScriptSupport/unittests.js b/src/extensions/default/TypeScriptSupport/unittests.js
index bc8aa1c349..ee8bda0035 100644
--- a/src/extensions/default/TypeScriptSupport/unittests.js
+++ b/src/extensions/default/TypeScriptSupport/unittests.js
@@ -431,19 +431,21 @@ define(function (require, exports, module) {
                 ExtensionLoader.getRequireContextForExtension("JavaScriptCodeHints")(["main"], resolve, reject);
             });
             let hintText = "";
-            await awaitsFor(function () {
+            await awaitsFor(async function () {
                 if (!jsCodeHints.jsHintProvider.hasHints(editor, null)) {
                     return false; // Tern session/worker may still be starting up
                 }
-                const response = jsCodeHints.jsHintProvider.getHints(null);
-                if (!response || typeof response.done !== "function") {
-                    return hintText.indexOf("push") !== -1; // sync response already captured below
+                // The provider returns a Deferred for fresh hints and an object for
+                // cached hints. Await either result before checking this request.
+                let result;
+                try {
+                    result = await jsCodeHints.jsHintProvider.getHints(null);
+                } catch (err) {
+                    return false; // A project/session change can cancel a pending request.
                 }
-                response.done(function (result) {
-                    hintText = ((result && result.hints) || []).map(function (h) {
-                        return $(h).text();
-                    }).join("|");
-                });
+                hintText = ((result && result.hints) || []).map(function (h) {
+                    return $(h).text();
+                }).join("|");
                 return hintText.indexOf("push") !== -1;
             }, "Tern Array-member completions at arr. inside the <script>", 30000, 500);
             expect(hintText).toContain("push");
@@ -917,10 +919,17 @@ define(function (require, exports, module) {
                 await awaitsFor(function () {
                     return panelText().includes("never read") && panelText().includes("deprecated");
                 }, "unused + deprecated hint rows in the problems panel", 30000);
-                // the marked text carries the tag styles on top of the info squiggle
+                // the marked text carries the tag styles on top of the info squiggle.
+                // Read the marks off the editor rather than looking for their spans in
+                // the page: CodeMirror only renders spans for lines it has painted, and
+                // late in a full run it had not, so this timed out with the marks - and
+                // the panel rows the waits above had already seen - all in place.
                 await awaitsFor(function () {
-                    return $(".editor-text-fragment-unnecessary").length > 0 &&
-                        $(".editor-text-fragment-deprecated").length > 0;
+                    const classes = editor.findMarks({line: 0, ch: 0}, {line: editor.lineCount(), ch: 0})
+                        .map(function (mark) { return mark.className || ""; })
+                        .join(" ");
+                    return classes.includes("editor-text-fragment-unnecessary") &&
+                        classes.includes("editor-text-fragment-deprecated");
                 }, "faded + strikethrough text marks in the editor", 30000);
             }, 90000);
 
diff --git a/src/language/CodeInspection.js b/src/language/CodeInspection.js
index 1074f1a9bf..50e2d3c9c7 100644
--- a/src/language/CodeInspection.js
+++ b/src/language/CodeInspection.js
@@ -652,7 +652,7 @@ define(function (require, exports, module) {
     }
 
     let fixIDCounter = 1;
-    let documentFixes = new Map(), lastDocumentScanTimeStamp;
+    let documentFixes = new Map(), lastDocumentScanTimeStamp, lastScannedDocument;
     function _registerNewFix(editor, fix, providerName, maxOffset) {
         if(!editor || !fix || !fix.rangeOffset) {
             return null;
@@ -747,10 +747,8 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Run inspector applicable to current document. Updates status bar indicator and refreshes error list in
-     * bottom panel. Does not run if inspection is disabled or if a providerName is given and does not
-     * match the current doc's provider name.
-     * @param {?string} providerName name of the provider that is requesting a run
+     * Run inspectors for the current document and publish results from the latest unchanged scan.
+     * Does not scan while inspection is disabled. Keeps valid fixes available until a current scan replaces them.
      */
     function run() {
         if(!problemsPanel){
@@ -778,8 +776,6 @@ define(function (require, exports, module) {
 
         let editor = EditorManager.getCurrentFullEditor(), fullFilePath;
         if(editor){
-            lastDocumentScanTimeStamp = editor.document.lastChangeTimestamp;
-            documentFixes.clear();
             fullFilePath = editor.document.file.fullPath;
         }
 
@@ -791,9 +787,20 @@ define(function (require, exports, module) {
                 html,
                 providersReportingProblems = [];
             scrollPositionMap.set($problemsPanelTable.lintFilePath || fullFilePath, $problemsPanelTable.scrollTop());
+            const scanTimestamp = currentDoc.lastChangeTimestamp;
 
             // run all the providers registered for this file type
             (_currentPromise = inspectFile(currentDoc.file, providerList)).then(function (results) {
+                // Check before changing marks, fixes or panel state: an older scan
+                // can finish after a newer scan, edit, or document switch.
+                if (this !== _currentPromise || currentDoc !== DocumentManager.getCurrentDocument() ||
+                    currentDoc.lastChangeTimestamp !== scanTimestamp ||
+                    editor !== EditorManager.getCurrentFullEditor()) {
+                    return;
+                }
+                lastDocumentScanTimeStamp = scanTimestamp;
+                lastScannedDocument = currentDoc;
+                documentFixes.clear();
                 // filter out any ignored results
                 results = results.filter(function (providerResult) {
                     return !providerResult.result || !providerResult.result.isIgnored;
@@ -805,11 +812,6 @@ define(function (require, exports, module) {
                 editor.clearAllMarks(CODE_MARK_TYPE_INSPECTOR);
                 editor.clearGutter(CODE_INSPECTION_GUTTER);
                 _updateEditorMarksAndFixResults(results);
-                // check if promise has not changed while inspectFile was running
-                if (this !== _currentPromise) {
-                    return;
-                }
-
                 // how many errors in total?
                 var errors = results.reduce(function (a, item) { return a + (item.result ? item.result.errors.length : 0); }, 0);
 
@@ -1215,11 +1217,16 @@ define(function (require, exports, module) {
             typeof fixDetails.replaceText !== "string");
     }
 
+    /**
+     * Apply one fix if its document and text still match the displayed inspection results.
+     * @param {string} fixID ID assigned to the displayed fix.
+     */
     function _fixProblem(fixID) {
         const fixDetails = documentFixes.get(fixID);
         const editor = EditorManager.getCurrentFullEditor();
-        const maxOffset = editor.document.getText().length;
-        if(!editor || !fixDetails || editor.document.lastChangeTimestamp !== lastDocumentScanTimeStamp) {
+        const maxOffset = editor ? editor.document.getText().length : 0;
+        if(!editor || !fixDetails || editor.document !== lastScannedDocument ||
+            editor.document.lastChangeTimestamp !== lastDocumentScanTimeStamp) {
             Metrics.countEvent(Metrics.EVENT_TYPE.LINT, "fixFail", "dialogShown");
             Dialogs.showErrorDialog(Strings.CANNOT_FIX_TITLE, Strings.CANNOT_FIX_MESSAGE);
         } else if(_isInvalidFix(fixDetails, maxOffset)){
@@ -1235,9 +1242,11 @@ define(function (require, exports, module) {
         run();
     }
 
+    /** Apply all displayed fixes only to the document version that was inspected. */
     function _fixAllProblems() {
         const editor = EditorManager.getCurrentFullEditor();
-        if(!editor || editor.document.lastChangeTimestamp !== lastDocumentScanTimeStamp) {
+        if(!editor || editor.document !== lastScannedDocument ||
+            editor.document.lastChangeTimestamp !== lastDocumentScanTimeStamp) {
             Dialogs.showErrorDialog(Strings.CANNOT_FIX_TITLE, Strings.CANNOT_FIX_MESSAGE);
             return;
         }
diff --git a/src/node-loader.js b/src/node-loader.js
index 094b5bf3df..8db3ca6cca 100644
--- a/src/node-loader.js
+++ b/src/node-loader.js
@@ -581,8 +581,15 @@ function nodeLoader() {
 
 
     window.nodeSetupDonePromise = new Promise((resolve, reject) =>{
+        // Test-only orphan cleanup, refreshed by SpecRunnerUtils. Both native paths
+        // below must keep startup arming gated by Phoenix.isTestWindow; normal editor
+        // sessions leave the Node watchdog disabled. Sleep or a suspended page can
+        // interrupt heartbeats and cause a false Node crash dialog after wake, so
+        // this timeout is only an acceptable tradeoff for test processes.
+        const TEST_NODE_IDLE_EXIT_MS = 120000;
         const NODE_COMMANDS = {
             TERMINATE: "terminate",
+            SET_IDLE_EXIT: "setIdleExit",
             PING: "ping",
             SET_DEBUG_MODE: "setDebugMode",
             GET_ENDPOINTS: "getEndpoints"
@@ -737,6 +744,21 @@ function nodeLoader() {
                 }
                 return nodeTerminationPromise;
             };
+            // Ask node to exit on its own if we stop talking to it for this long.
+            // Only the test runner uses this: a terminate sent while the page is
+            // being torn down is an async write that usually never lands, which is
+            // how abandoned test windows leave their node engines running.
+            window.PhNodeEngine.setIdleExit = function (idleMs) {
+                if(window.isNodeTerminated) {
+                    return Promise.resolve();
+                }
+                return execNode(NODE_COMMANDS.SET_IDLE_EXIT, idleMs);
+            };
+            if(Phoenix.isTestWindow) {
+                // Arm at spawn, not on the test runner's first heartbeat: a page reloaded
+                // before that heartbeat left its engine unarmed and running forever.
+                window.PhNodeEngine.setIdleExit(TEST_NODE_IDLE_EXIT_MS);
+            }
             window.PhNodeEngine.getInspectPort = function () {
                 return inspectPort;
             };
@@ -851,6 +873,16 @@ function nodeLoader() {
                 }
                 return nodeTerminationPromise;
             };
+            // See the tauri path above - only the test runner asks for this.
+            window.PhNodeEngine.setIdleExit = function (idleMs) {
+                if (window.isNodeTerminated) {
+                    return Promise.resolve();
+                }
+                return execNode(NODE_COMMANDS.SET_IDLE_EXIT, idleMs);
+            };
+            if (Phoenix.isTestWindow) {
+                window.PhNodeEngine.setIdleExit(TEST_NODE_IDLE_EXIT_MS);
+            }
             window.PhNodeEngine.getInspectPort = function () {
                 return inspectPort;
             };
diff --git a/src/project/FileSyncManager.js b/src/project/FileSyncManager.js
index 814b9d4de2..b06cb0f6ba 100644
--- a/src/project/FileSyncManager.js
+++ b/src/project/FileSyncManager.js
@@ -219,22 +219,58 @@ define(function (require, exports, module) {
 
 
     /**
-     * Reloads the Document's contents from disk, discarding any unsaved changes in the editor.
+     * Reloads a Document from disk unless it is edited or saved while the read is pending.
      * @private
      * @param {!Document} doc
-     * @return {$.Promise} Resolved after editor has been refreshed; rejected if unable to load the
-     *      file's new content. Errors are logged but no UI is shown.
+     * @param {boolean=} discardChanges Whether the user explicitly chose to discard existing edits.
+     * @return {$.Promise} Resolved after refreshing or discarding a stale read; rejected if unable
+     *      to load the file's new content. Errors are logged but no UI is shown.
      */
-    function reloadDoc(doc) {
+    function reloadDoc(doc, discardChanges = false) {
+        // The document may have closed, changed or started saving since classification.
+        if (DocumentManager.getOpenDocumentForPath(doc.file.fullPath) !== doc ||
+                (!discardChanges && doc.isDirty) || doc.isSaving) {
+            return $.Deferred().resolve().promise();
+        }
 
-        var promise = FileUtils.readAsText(doc.file);
+        let changedDuringRead = false;
+        let tracking = true;
+        const onChange = function () {
+            changedDuringRead = true;
+        };
+        /** Release this read's listeners and document reference exactly once. */
+        const stopTracking = function () {
+            if (!tracking) {
+                return;
+            }
+            tracking = false;
+            doc.off("change _dirtyFlagChange", onChange);
+            doc.off("deleted", onDeleted);
+            doc.releaseRef();
+        };
+        const onDeleted = function () {
+            changedDuringRead = true;
+            stopTracking();
+        };
+        doc.addRef();
+        doc.on("deleted", onDeleted);
+        // Saving existing edits after choosing "Reload from disk" changes the
+        // dirty flag without another text change. Track that transition too,
+        // before the save's asynchronous timestamp update has necessarily finished.
+        doc.on("change _dirtyFlagChange", onChange);
+        const promise = FileUtils.readAsText(doc.file);
 
         promise.done(function (text, readTimestamp) {
-            doc.refreshText(text, readTimestamp);
+            // A newer edit can already be saved by now, so the dirty flag alone
+            // cannot tell whether these bytes still belong to the current version.
+            if (!changedDuringRead && (discardChanges || !doc.isDirty) && !doc.isSaving) {
+                doc.refreshText(text, readTimestamp);
+            }
         });
         promise.fail(function (error) {
             console.log("Error reloading contents of " + doc.file.fullPath, error);
         });
+        promise.always(stopTracking);
         return promise;
     }
 
@@ -247,7 +283,7 @@ define(function (require, exports, module) {
      */
     function reloadChangedDocs() {
         // Reload each doc in turn, and once all are (async) done, signal that we're done
-        return Async.doInParallel(toReload, reloadDoc, false);
+        return Async.doInParallel(toReload, doc => reloadDoc(doc), false);
     }
 
     /**
@@ -366,7 +402,7 @@ define(function (require, exports, module) {
                             result.resolve();
                         } else {
                             // Discard - load changes from disk
-                            reloadDoc(doc)
+                            reloadDoc(doc, true)
                                 .done(function () {
                                     result.resolve();
                                 })
diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js
index c4c5aa1080..ecf293a303 100644
--- a/src/project/ProjectModel.js
+++ b/src/project/ProjectModel.js
@@ -593,12 +593,16 @@ define(function (require, exports, module) {
      * directory traversal is active at a time, which is useful at project load
      * time when watchers (and hence filesystem-level caching) has not finished
      * starting up. The cache is cleared on every filesystem change event, and
-     * also on project load and unload.
+     * also on project load and unload. With no project root, resolves with an empty list.
      *
      * @param {boolean} sort true to sort files by their paths
+     * @param {Array<Object>=} _gitIgnoreFiltersOut Receives ignore filters found during traversal.
      * @return {$.Promise.<Array.<File>>}
      */
     ProjectModel.prototype._getAllFilesCache = function _getAllFilesCache(sort, _gitIgnoreFiltersOut) {
+        if (!this.projectRoot) {
+            return $.Deferred().resolve([]).promise();
+        }
         let self = this;
         if (!this._allFilesCachePromise) {
             let gitIgnoreFilters = _gitIgnoreFiltersOut || [], gitIgnoreSearchedInDir = {};
diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js
index 68d47b794c..ecace4a2c8 100644
--- a/test/UnitTestSuite.js
+++ b/test/UnitTestSuite.js
@@ -61,6 +61,7 @@ define(function (require, exports, module) {
     require("spec/JSONUtils-test");
     require("spec/JSUtils-test");
     require("spec/JSUtils-integ-test");
+    require("spec/ScopeManager-integ-test");
     require("spec/KeyBindingManager-test");
     require("spec/KeybindingManager-integ-test");
     require("spec/LanguageManager-test");
diff --git a/test/spec/CodeInspection-fix-integ-test.js b/test/spec/CodeInspection-fix-integ-test.js
index f368163b9d..11140f9d34 100644
--- a/test/spec/CodeInspection-fix-integ-test.js
+++ b/test/spec/CodeInspection-fix-integ-test.js
@@ -51,7 +51,7 @@ define(function (require, exports, module) {
             };
         }
 
-        let invalidFix;
+        let invalidFix, testInspector;
 
         function scanFile(text, fullPath) {
             const currentEditor = EditorManager.getActiveEditor();
@@ -114,7 +114,7 @@ define(function (require, exports, module) {
             prefs = brackets.test.PreferencesManager.getExtensionPrefs("linting");
             CodeInspection = brackets.test.CodeInspection;
             PreferencesManager = brackets.test.PreferencesManager;
-            createVBScriptInspector();
+            testInspector = createVBScriptInspector();
             CodeInspection.toggleEnabled(true);
             testFolder = await SpecRunnerUtils.getTempTestDirectory("/spec/CodeInspection-test-files/");
             await SpecRunnerUtils.loadProjectInTestWindow(testFolder);
@@ -263,6 +263,64 @@ define(function (require, exports, module) {
             await _openProjectFile(fileName);
         }
 
+        /**
+         * Hold scans of the open fixture so tests can control when results arrive.
+         * @return {{pending: Array<Object>, restore: Function}} Pending scans and cleanup.
+         */
+        function holdInspectionResults() {
+            const pending = [];
+            testInspector.scanFileAsync = function (text, fullPath) {
+                const deferred = $.Deferred();
+                pending.push({deferred, result: scanFile(text, fullPath)});
+                return deferred.promise();
+            };
+            return {
+                pending,
+                restore: async function () {
+                    delete testInspector.scanFileAsync;
+                    pending.forEach(scan => scan.deferred.resolve(scan.result));
+                    await Promise.all(pending.map(scan => testWindow.jsPromise(scan.deferred.promise())));
+                }
+            };
+        }
+
+        it("should keep visible fixes usable while an unchanged document is rescanned", async function () {
+            await _openProjectFile("testFix.vbs");
+            const editor = EditorManager.getActiveEditor();
+            const scans = holdInspectionResults();
+            try {
+                CodeInspection.requestRun();
+                await awaitsFor(() => scans.pending.length > 0, "replacement scan to start");
+                expect($("#problems-panel .problems-fix-all-btn").is(":visible")).toBeTrue();
+                $("#problems-panel .problems-fix-all-btn").click();
+                expect(editor.document.getText()).not.toContain("fixable");
+            } finally {
+                await scans.restore();
+            }
+        });
+
+        it("should ignore older diagnostics after a newer scan has cleared them", async function () {
+            await _openProjectFile("testFix.vbs");
+            const editor = EditorManager.getActiveEditor();
+            const scans = holdInspectionResults();
+            try {
+                CodeInspection.requestRun();
+                await awaitsFor(() => scans.pending.length === 1, "first scan to start");
+                CodeInspection.requestRun();
+                await awaitsFor(() => scans.pending.length === 2, "second scan to start");
+                scans.pending[1].deferred.resolve({errors: []});
+                await testWindow.jsPromise(scans.pending[1].deferred.promise());
+                expect(editor.getAllMarks("codeInspector").length).toBe(0);
+                scans.pending[0].deferred.resolve(scans.pending[0].result);
+                await testWindow.jsPromise(scans.pending[0].deferred.promise());
+                expect(editor.getAllMarks("codeInspector").length).toBe(0);
+                expect($("#problems-panel .ph-fix-problem").length).toBe(0);
+                expect($("#problems-panel .problems-fix-all-btn").is(":visible")).toBeFalse();
+            } finally {
+                await scans.restore();
+            }
+        });
+
         it("should fix by clicking fix button in quick view and undo", async function () {
             await _openProjectFile("testFix.vbs");
 
diff --git a/test/spec/Document-integ-test.js b/test/spec/Document-integ-test.js
index 683547014e..1718cf0e91 100644
--- a/test/spec/Document-integ-test.js
+++ b/test/spec/Document-integ-test.js
@@ -19,7 +19,7 @@
  *
  */
 
-/*global jasmine, describe, beforeAll, afterAll,beforeEach, afterEach, it, expect, awaitsForDone */
+/*global jasmine, describe, beforeAll, afterAll,beforeEach, afterEach, it, expect, awaitsForDone, awaitsFor, spyOn */
 
 define(function (require, exports, module) {
 
@@ -33,6 +33,7 @@ define(function (require, exports, module) {
         Editor,     // loaded from brackets.test
         MainViewManager,     // loaded from brackets.test
         SpecRunnerUtils     = require("spec/SpecRunnerUtils");
+    let FileSyncManager, FileUtils, FileSystem, Dialogs;
 
     describe("LegacyInteg:Document Integration", function () {
 
@@ -51,6 +52,10 @@ define(function (require, exports, module) {
             DocumentModule      = testWindow.brackets.test.DocumentModule;
             DocumentManager     = testWindow.brackets.test.DocumentManager;
             MainViewManager     = testWindow.brackets.test.MainViewManager;
+            FileSyncManager     = testWindow.brackets.test.FileSyncManager;
+            FileUtils           = testWindow.brackets.test.FileUtils;
+            FileSystem          = testWindow.brackets.test.FileSystem;
+            Dialogs             = testWindow.brackets.test.Dialogs;
             Editor     = testWindow.brackets.test.Editor;
 
             await SpecRunnerUtils.loadProjectInTestWindow(testPath);
@@ -64,6 +69,10 @@ define(function (require, exports, module) {
             DocumentModule  = null;
             DocumentManager = null;
             MainViewManager = null;
+            FileSyncManager = null;
+            FileUtils = null;
+            FileSystem = null;
+            Dialogs = null;
             await SpecRunnerUtils.closeTestWindow();
             testWindow = null;
         }, 30000);
@@ -78,6 +87,364 @@ define(function (require, exports, module) {
             CSS_FILE  = testPath + "/test.css",
             HTML_FILE = testPath + "/test.html";
 
+        describe("External file refresh", function () {
+            let pendingReads = [];
+            let refreshDocuments = [];
+            let temporaryFiles = [];
+
+            afterEach(async function () {
+                // Unblock FileSyncManager even if a test fails before releasing its read.
+                pendingReads.forEach(read => read.reject("TEST_REFRESH_CANCELLED"));
+                refreshDocuments.forEach(doc => { doc.isSaving = false; });
+                pendingReads = [];
+                refreshDocuments = [];
+                for (const file of temporaryFiles) {
+                    await awaitsForDone(CommandManager.execute(Commands.FILE_CLOSE,
+                        {file, _forceClose: true}), "close refresh fixture");
+                    await awaitsForDone(SpecRunnerUtils.deletePath(file.fullPath), "remove refresh fixture");
+                }
+                temporaryFiles = [];
+            });
+
+            /**
+             * Hold a disk refresh until the test has changed the open document.
+             * @param {string=} dirtyText Initial unsaved text to discard through the conflict dialog.
+             * @param {Object=} options Optional classification hook or conflict-dialog choice.
+             * @return {Promise<Object>} Document, read state and controls for completing or retrying the refresh.
+             */
+            async function startRefresh(dirtyText, options = {}) {
+                const path = options.path || JS_FILE;
+                await awaitsForDone(CommandManager.execute(Commands.FILE_OPEN, {fullPath: path}), "open refresh document");
+                const doc = DocumentManager.getOpenDocumentForPath(path);
+                refreshDocuments.push(doc);
+                if (dirtyText !== undefined) {
+                    doc.setText(dirtyText);
+                    spyOn(Dialogs, "showModalDialog").and.returnValue(
+                        $.Deferred().resolve(options.choice || Dialogs.DIALOG_BTN_DONTSAVE).promise());
+                }
+                const diskTime = new Date(doc.diskTimestamp.getTime() + 1000);
+                const initialRefCount = doc._refCount;
+                const pendingRead = new $.Deferred();
+                pendingReads.push(pendingRead);
+                let classified = false;
+                const stat = spyOn(doc.file, "stat").and.callFake(callback => {
+                    callback(null, {mtime: diskTime});
+                    if (options.afterClassification) {
+                        options.afterClassification(doc);
+                    }
+                    classified = true;
+                });
+                let readingDocument = false;
+                const readAsText = FileUtils.readAsText;
+                const read = spyOn(FileUtils, "readAsText").and.callFake(function (file) {
+                    if (file.fullPath === doc.file.fullPath) {
+                        readingDocument = true;
+                        return pendingRead.promise();
+                    }
+                    return readAsText.apply(this, arguments);
+                });
+                FileSyncManager.syncOpenDocuments();
+                try {
+                    await awaitsFor(() => options.skipRead ? classified : readingDocument,
+                        "external refresh to reach the expected phase");
+                } finally {
+                    // Restore metadata access before resolving the read so a subsequent
+                    // focus event cannot start another synthetic external-change check.
+                    stat.and.callThrough();
+                    read.and.callThrough();
+                }
+                return {
+                    doc,
+                    diskTime,
+                    initialRefCount,
+                    readingDocument,
+                    finish: text => pendingRead.resolve(text, diskTime),
+                    fail: error => pendingRead.reject(error),
+                    retry: function (text) {
+                        stat.and.callFake(callback => callback(null, {mtime: diskTime}));
+                        read.and.callFake(file => file === doc.file
+                            ? $.Deferred().resolve(text, diskTime).promise() : readAsText(file));
+                        try {
+                            FileSyncManager.syncOpenDocuments();
+                        } finally {
+                            stat.and.callThrough();
+                            read.and.callThrough();
+                        }
+                    }
+                };
+            }
+
+            /**
+             * Hold actual disk-read bytes while the normal save command writes a newer version.
+             * Only delivery of the read result is delayed; file reads, writes and saves remain real.
+             * @param {string=} dirtyText Unsaved text present when the user chooses to reload.
+             * @return {Promise<Object>} Document, captured disk contents and a read completion callback.
+             */
+            async function startRealRefresh(dirtyText) {
+                await SpecRunnerUtils.createTempDirectory();
+                const path = SpecRunnerUtils.getTempDirectory() + "/filesync-" + Date.now() + ".txt";
+                const file = FileSystem.getFileForPath(path);
+                temporaryFiles.push(file);
+                await awaitsForDone(FileUtils.writeText(file, "initial content", true), "create refresh fixture");
+                await awaitsForDone(CommandManager.execute(Commands.FILE_OPEN, {fullPath: path}), "open refresh fixture");
+                const doc = DocumentManager.getOpenDocumentForPath(path);
+                refreshDocuments.push(doc);
+                if (dirtyText !== undefined) {
+                    doc.setText(dirtyText);
+                    spyOn(Dialogs, "showModalDialog").and.returnValue(
+                        $.Deferred().resolve(Dialogs.DIALOG_BTN_DONTSAVE).promise());
+                }
+                const pendingRead = new $.Deferred();
+                pendingReads.push(pendingRead);
+                const readAsText = FileUtils.readAsText;
+                let captured;
+                let intercepted = false;
+                const read = spyOn(FileUtils, "readAsText").and.callFake(function (readFile) {
+                    if (readFile === file && !intercepted) {
+                        intercepted = true;
+                        // Bypass File's cache so the captured bytes come from the filesystem.
+                        const result = readAsText.call(this, readFile, true);
+                        result.done((text, timestamp) => { captured = {text, timestamp}; });
+                        result.fail(error => pendingRead.reject(error));
+                        return pendingRead.promise();
+                    }
+                    return readAsText.apply(this, arguments);
+                });
+                try {
+                    await awaitsForDone(FileUtils.writeText(file, "external content", true), "write external version");
+                    FileSyncManager.syncOpenDocuments();
+                    await awaitsFor(() => captured, "capture actual external disk contents");
+                } finally {
+                    read.and.callThrough();
+                }
+                expect(captured.text).toBe("external content");
+                return {
+                    doc,
+                    finish: () => pendingRead.resolve(captured.text, captured.timestamp)
+                };
+            }
+
+            it("should apply a disk refresh when the document has not changed", async function () {
+                const refresh = await startRefresh();
+                refresh.finish("external content");
+                expect(refresh.doc.getText()).toBe("external content");
+                expect(refresh.doc.isDirty).toBeFalse();
+                expect(refresh.doc._refCount).toBe(refresh.initialRefCount);
+            });
+
+            it("should preserve edits made while a disk refresh is pending", async function () {
+                const refresh = await startRefresh();
+                refresh.doc.setText("newer edit");
+                refresh.finish("older disk content");
+                expect(refresh.doc.getText()).toBe("newer edit");
+                expect(refresh.doc.isDirty).toBeTrue();
+            });
+
+            it("should preserve a newer clean version while a disk refresh is pending", async function () {
+                const refresh = await startRefresh();
+                const newerTime = new Date(refresh.doc.diskTimestamp.getTime() + 2000);
+                refresh.doc.refreshText("newer restored content", newerTime);
+                refresh.finish("older disk content");
+                expect(refresh.doc.getText()).toBe("newer restored content");
+                expect(refresh.doc.diskTimestamp).toBe(newerTime);
+                expect(refresh.doc.isDirty).toBeFalse();
+            });
+
+            it("should discard unsaved changes when the user chooses to reload from disk", async function () {
+                const refresh = await startRefresh("unsaved changes");
+                expect(Dialogs.showModalDialog).toHaveBeenCalled();
+                refresh.finish("external content");
+                expect(refresh.doc.getText()).toBe("external content");
+                expect(refresh.doc.isDirty).toBeFalse();
+            });
+
+            it("should preserve edits made after the user chooses to reload from disk", async function () {
+                const refresh = await startRefresh("unsaved changes");
+                refresh.doc.setText("edit after confirming reload");
+                refresh.finish("older disk content");
+                expect(refresh.doc.getText()).toBe("edit after confirming reload");
+                expect(refresh.doc.isDirty).toBeTrue();
+            });
+
+            it("should preserve edits made after classification but before reading", async function () {
+                const refresh = await startRefresh(undefined, {
+                    afterClassification: doc => doc.setText("edit after classification"),
+                    skipRead: true
+                });
+                expect(refresh.readingDocument).toBeFalse();
+                refresh.finish("older disk content");
+                expect(refresh.doc.getText()).toBe("edit after classification");
+                expect(refresh.doc.isDirty).toBeTrue();
+            });
+
+            it("should not start a refresh while the document is saving", async function () {
+                const refresh = await startRefresh(undefined, {
+                    afterClassification: doc => { doc.isSaving = true; },
+                    skipRead: true
+                });
+                const text = refresh.doc.getText();
+                expect(refresh.readingDocument).toBeFalse();
+                refresh.finish("older disk content");
+                expect(refresh.doc.getText()).toBe(text);
+            });
+
+            it("should protect later documents in a batch without treating their index as discard permission", async function () {
+                await awaitsForDone(CommandManager.execute(Commands.CMD_ADD_TO_WORKINGSET_AND_OPEN,
+                    {fullPath: HTML_FILE}), "retain first document in working set");
+                const firstDoc = DocumentManager.getOpenDocumentForPath(HTML_FILE);
+                firstDoc.addRef();
+                let firstStat;
+                let openDocuments;
+                try {
+                    await awaitsForDone(CommandManager.execute(Commands.FILE_OPEN,
+                        {fullPath: JS_FILE}), "open second document before installing metadata spies");
+                    const secondDoc = DocumentManager.getOpenDocumentForPath(JS_FILE);
+                    // Document ids depend on earlier file discovery; explicitly exercise index 1.
+                    openDocuments = spyOn(DocumentManager, "getAllOpenDocuments")
+                        .and.returnValue([firstDoc, secondDoc]);
+                    const firstTime = new Date(firstDoc.diskTimestamp.getTime() + 1000);
+                    firstStat = spyOn(firstDoc.file, "stat").and.callFake(callback => {
+                        callback(null, {mtime: firstTime});
+                    });
+                    const refresh = await startRefresh(undefined, {
+                        path: JS_FILE,
+                        afterClassification: doc => {
+                            firstStat.and.callThrough();
+                            doc.setText("newer second document");
+                        },
+                        skipRead: true
+                    });
+                    expect(FileUtils.readAsText.calls.allArgs().some(args => args[0] === firstDoc.file))
+                        .withContext(JSON.stringify({
+                            reads: FileUtils.readAsText.calls.allArgs().map(args => args[0].fullPath),
+                            stats: firstStat.calls.count(),
+                            dirty: firstDoc.isDirty,
+                            saving: firstDoc.isSaving,
+                            open: DocumentManager.getAllOpenDocuments().map(doc => doc.file.fullPath)
+                        })).toBeTrue();
+                    expect(refresh.readingDocument).toBeFalse();
+                    refresh.finish("older second document");
+                    expect(refresh.doc.getText()).toBe("newer second document");
+                    expect(refresh.doc.isDirty).toBeTrue();
+                } finally {
+                    if (firstStat) {
+                        firstStat.and.callThrough();
+                    }
+                    if (openDocuments) {
+                        openDocuments.and.callThrough();
+                    }
+                    firstDoc.releaseRef();
+                }
+            });
+
+            it("should not apply a pending refresh while the document is saving", async function () {
+                const refresh = await startRefresh();
+                const text = refresh.doc.getText();
+                const timestamp = refresh.doc.diskTimestamp;
+                refresh.doc.isSaving = true;
+                refresh.finish("older disk content");
+                expect(refresh.doc.getText()).toBe(text);
+                expect(refresh.doc.diskTimestamp).toBe(timestamp);
+            });
+
+            it("should retain undo history when rejecting a stale read", async function () {
+                const refresh = await startRefresh();
+                const original = refresh.doc.getText();
+                refresh.doc.replaceRange("new edit\n", {line: 0, ch: 0});
+                refresh.finish("older disk content");
+                EditorManager.getActiveEditor().undo();
+                expect(refresh.doc.getText()).toBe(original);
+            });
+
+            it("should keep unsaved changes when the user declines a disk reload", async function () {
+                const refresh = await startRefresh("keep my edits", {
+                    choice: Dialogs.DIALOG_BTN_CANCEL,
+                    skipRead: true
+                });
+                expect(Dialogs.showModalDialog).toHaveBeenCalled();
+                expect(refresh.readingDocument).toBeFalse();
+                expect(refresh.doc.getText()).toBe("keep my edits");
+                expect(refresh.doc.isDirty).toBeTrue();
+                expect(refresh.doc.keepChangesTime).toBe(refresh.diskTime.getTime());
+            });
+
+            it("should leave the document unchanged after a failed read and allow a later refresh", async function () {
+                const refresh = await startRefresh();
+                const text = refresh.doc.getText();
+                const timestamp = refresh.doc.diskTimestamp;
+                refresh.fail("NOT_READABLE");
+                expect(refresh.doc.getText()).toBe(text);
+                expect(refresh.doc.diskTimestamp).toBe(timestamp);
+                expect(refresh.doc._refCount).toBe(refresh.initialRefCount);
+                refresh.retry("successful retry");
+                expect(refresh.doc.getText()).toBe("successful retry");
+                expect(refresh.doc.diskTimestamp).toBe(refresh.diskTime);
+            });
+
+            it("should allow a later refresh after rejecting a stale read", async function () {
+                const refresh = await startRefresh();
+                refresh.doc.replaceRange("new edit\n", {line: 0, ch: 0});
+                refresh.finish("older disk content");
+                EditorManager.getActiveEditor().undo();
+                expect(refresh.doc.isDirty).toBeFalse();
+                refresh.retry("latest disk version");
+                expect(refresh.doc.getText()).toBe("latest disk version");
+                expect(refresh.doc.isDirty).toBeFalse();
+            });
+
+            it("should retain unsaved edits and report an error when a confirmed reload fails", async function () {
+                const refresh = await startRefresh("unsaved edits");
+                refresh.fail("NOT_READABLE");
+                expect(Dialogs.showModalDialog.calls.count()).toBe(2);
+                expect(refresh.doc.getText()).toBe("unsaved edits");
+                expect(refresh.doc.isDirty).toBeTrue();
+                expect(refresh.doc._refCount).toBe(refresh.initialRefCount);
+            });
+
+            it("should preserve a real save completed while an older disk read is pending", async function () {
+                const refresh = await startRealRefresh();
+                refresh.doc.setText("newer saved content");
+                await awaitsForDone(CommandManager.execute(Commands.FILE_SAVE, {doc: refresh.doc}), "save newer edit");
+                expect(refresh.doc.isDirty).toBeFalse();
+                expect(refresh.doc.isSaving).toBeFalse();
+                refresh.finish();
+                expect(refresh.doc.getText()).toBe("newer saved content");
+                expect(await FileUtils.readAsText(refresh.doc.file, true)).toBe("newer saved content");
+            });
+
+            it("should release a deleted document and ignore its pending read", async function () {
+                const refresh = await startRefresh();
+                const refreshText = spyOn(refresh.doc, "refreshText").and.callThrough();
+                DocumentManager.notifyFileDeleted(refresh.doc.file);
+                expect(DocumentManager.getOpenDocumentForPath(refresh.doc.file.fullPath)).toBeFalsy();
+                refresh.finish("content from before deletion");
+                expect(refreshText).not.toHaveBeenCalled();
+                expect(refresh.doc._refCount).toBe(0);
+            });
+
+            it("should not resurrect a document deleted between classification and reading", async function () {
+                const refresh = await startRefresh(undefined, {
+                    afterClassification: doc => DocumentManager.notifyFileDeleted(doc.file),
+                    skipRead: true
+                });
+                expect(refresh.readingDocument).toBeFalse();
+                expect(DocumentManager.getOpenDocumentForPath(refresh.doc.file.fullPath)).toBeFalsy();
+                expect(refresh.doc._refCount).toBe(0);
+                refresh.finish("content from before deletion");
+                expect(refresh.doc._refCount).toBe(0);
+            });
+
+            it("should preserve a save made after choosing reload without another text edit", async function () {
+                const refresh = await startRealRefresh("edits saved after choosing reload");
+                await awaitsForDone(CommandManager.execute(Commands.FILE_SAVE, {doc: refresh.doc}), "save existing edits");
+                expect(refresh.doc.isDirty).toBeFalse();
+                expect(refresh.doc.isSaving).toBeFalse();
+                refresh.finish();
+                expect(refresh.doc.getText()).toBe("edits saved after choosing reload");
+                expect(await FileUtils.readAsText(refresh.doc.file, true)).toBe("edits saved after choosing reload");
+            });
+        });
+
 
         describe("Dirty flag and undo", function () {
             var promise;
diff --git a/test/spec/Extn-ESLint-integ-test.js b/test/spec/Extn-ESLint-integ-test.js
index ef09d0ef00..5eccf27b3f 100644
--- a/test/spec/Extn-ESLint-integ-test.js
+++ b/test/spec/Extn-ESLint-integ-test.js
@@ -392,20 +392,17 @@ define(function (require, exports, module) {
         });
 
         describe("ESLint v9 with fixes project", function () {
-            let esLatestProjectPath, originalErrorFile;
+            let esLatestProjectPath;
 
             beforeAll(async function () {
                 esLatestProjectPath = await _createTempProject("es9_with_fixes");
                 await _npmInstallInFolder(esLatestProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(esLatestProjectPath);
-                await _openProjectFile("error.js");
-                const editor = EditorManager.getCurrentFullEditor();
-                originalErrorFile = editor.document.getText();
             }, 30000);
 
             beforeEach(async function () {
-                await jsPromise(SpecRunnerUtils.createTextFile(path.join(esLatestProjectPath, "error.js"),
-                    originalErrorFile, FileSystem));
+                // Fixes are unsaved edits. Closing them restores the unchanged fixture
+                // without a disk write racing the next document's initial lint scan.
                 await testWindow.closeAllFiles();
             });
 
@@ -452,25 +449,11 @@ define(function (require, exports, module) {
 
             it("should be able to fix all errors", async function () {
                 await _openAndVerifyInitial();
-                let editor = EditorManager.getCurrentFullEditor();
+                const editor = EditorManager.getCurrentFullEditor();
                 editor.setCursorPos(0, 0); // resent any saved selections from previous run
                 // click on fix : Expected indentation of 4 spaces but found 9. ESLint (indent)
-                // a late doc reload can stale the fixes and pop the "Failed to Apply Fix" dialog
-                // on slow CI; dismiss it, re-lint and retry so it doesn't leak into later suites
                 $($("#problems-panel").find(".problems-fix-all-btn")).click();
-                await awaitsFor(async ()=>{
-                    if($(".error-dialog.instance").length){
-                        testWindow.brackets.test.Dialogs.cancelModalDialogIfOpen(
-                            testWindow.brackets.test.DefaultDialogs.DIALOG_ID_ERROR);
-                        await _triggerLint();
-                        await awaitsFor(()=>{
-                            return $("#problems-panel").find(".ph-fix-problem").length === 2;
-                        }, "fix buttons to reappear after re-lint", 15000);
-                        editor = EditorManager.getCurrentFullEditor();
-                        editor.setCursorPos(0, 0);
-                        $($("#problems-panel").find(".problems-fix-all-btn")).click();
-                        return false;
-                    }
+                await awaitsFor(()=>{
                     return $("#problems-panel").find(".ph-fix-problem").length === 0;
                 }, "no problems should remain as all is now fixed", 30000);
 
diff --git a/test/spec/Extn-Git-integ-test.js b/test/spec/Extn-Git-integ-test.js
index fa00051568..95081fcf35 100644
--- a/test/spec/Extn-Git-integ-test.js
+++ b/test/spec/Extn-Git-integ-test.js
@@ -686,41 +686,45 @@ define(function (require, exports, module) {
             const BULK_FILE_COUNT = 51;
 
             it("should confirm before opening a large number of changed files", async () => {
-                await showGitPanel();
-                await __PR.closeAll();
-                await awaitsFor(()=>{
-                    return MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES) === 0;
-                }, "working set to be empty");
+                const changedFiles = ["test.css", "test.js"];
+                await makeFilesChanged(changedFiles);
 
                 for (let i = 0; i < BULK_FILE_COUNT; i++) {
-                    await __PR.writeTextFile(`bulkFile${i}.txt`, `bulk file ${i}\n`, true);
+                    const fileName = `bulkFile${i}.txt`;
+                    await __PR.writeTextFile(fileName, `bulk file ${i}\n`, true);
+                    changedFiles.push(fileName);
                 }
                 await __PR.execCommand(Commands.CMD_GIT_REFRESH);
+                // Refresh dispatches an event without waiting for Git status. Earlier
+                // watcher results can already contain 51 rows while the final files
+                // are still being written, so wait for the complete fixture list.
+                const changedFileCount = changedFiles.length;
                 await awaitsFor(()=>{
-                    return $gitPanel.find(".modified-file").length >= BULK_FILE_COUNT;
+                    const panelFiles = $gitPanel.find(".modified-file").map((index, row) =>
+                        $(row).attr("x-file")).get();
+                    return panelFiles.length === changedFileCount &&
+                        changedFiles.every(fileName => panelFiles.includes(fileName));
                 }, "bulk files to be in modified files list", 30000);
 
-                // nothing is deleted and untracked files are shown, so every row in the
-                // panel is a file the command will open
-                const changedFileCount = $gitPanel.find(".modified-file").length;
-
                 // cancelling the confirmation must not open anything
-                __PR.execCommand(Commands.CMD_GIT_OPEN_CHANGED_FILES); // dont await here as
-                // it only completes after the dialog is closed
+                let openChangedFiles = __PR.execCommand(Commands.CMD_GIT_OPEN_CHANGED_FILES);
                 await __PR.waitForModalDialog("#git-question-dialog", null, 10000);
                 __PR.clickDialogButtonID(__PR.Dialogs.DIALOG_BTN_CANCEL);
                 await __PR.waitForModalDialogClosed("#git-question-dialog");
-                await __PR.execCommand(Commands.CMD_GIT_REFRESH);
+                await openChangedFiles;
                 expect(MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES)).toBe(0);
 
                 // confirming opens all of them
-                __PR.execCommand(Commands.CMD_GIT_OPEN_CHANGED_FILES);
+                openChangedFiles = __PR.execCommand(Commands.CMD_GIT_OPEN_CHANGED_FILES);
                 await __PR.waitForModalDialog("#git-question-dialog", null, 10000);
                 __PR.clickDialogButtonID(__PR.Dialogs.DIALOG_BTN_OK);
                 await __PR.waitForModalDialogClosed("#git-question-dialog");
+                await openChangedFiles;
                 await awaitsFor(()=>{
-                    return MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES) === changedFileCount;
-                }, "all changed files to be opened", 30000);
+                    return MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES) === changedFileCount &&
+                        changedFiles.every(workingSetHas);
+                }, () => `all ${changedFileCount} changed files to be opened; working set has ` +
+                    MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES), 30000);
 
                 // re-running it now asks nothing as the files are already open. awaiting
                 // here is safe for that reason, a dialog coming up would time out the spec
diff --git a/test/spec/LiveDevelopmentMultiBrowser-test.js b/test/spec/LiveDevelopmentMultiBrowser-test.js
index 2e08e7e763..020495cfdf 100644
--- a/test/spec/LiveDevelopmentMultiBrowser-test.js
+++ b/test/spec/LiveDevelopmentMultiBrowser-test.js
@@ -1351,7 +1351,12 @@ define(function (require, exports, module) {
                     // just exec and return if no compare function is specified
                     return true;
                 },
-                "awaitRemoteExec",
+                // Name the script and the page's last answer: a spec may wait on several of
+                // these in a row, and a bare "awaitRemoteExec" never said which one stalled.
+                function () {
+                    return "awaitRemoteExec: " + script + " - last reply: " +
+                        (replied ? JSON.stringify(result) : "none");
+                },
                 5000,
                 50
             );
diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js
index c2b0930fe6..75f61542f4 100644
--- a/test/spec/ProjectModel-test.js
+++ b/test/spec/ProjectModel-test.js
@@ -58,6 +58,24 @@ define(function (require, exports, module) {
             expect(pm.projectRoot).toBe(null);
         });
 
+        describe("without a project root", function () {
+            it("should return no project files", async function () {
+                const pm = new ProjectModel.ProjectModel();
+                expect(await pm.getAllFiles()).toEqual([]);
+            });
+
+            it("should still include additional open files", async function () {
+                const pm = new ProjectModel.ProjectModel();
+                const file = {fullPath: "/standalone.js"};
+                expect(await pm.getAllFiles([file])).toEqual([file]);
+            });
+
+            it("should return no project ignore filters", async function () {
+                const pm = new ProjectModel.ProjectModel();
+                expect(await pm.computeProjectGitIgnoreAsync()).toEqual([]);
+            });
+        });
+
         describe("with projectRoot", function () {
             var root, pm;
 
diff --git a/test/spec/ScopeManager-integ-test.js b/test/spec/ScopeManager-integ-test.js
new file mode 100644
index 0000000000..78fb20f17c
--- /dev/null
+++ b/test/spec/ScopeManager-integ-test.js
@@ -0,0 +1,99 @@
+/*
+ * GNU AGPL-3.0 License
+ * Copyright (c) 2021 - present core.ai . All rights reserved.
+ */
+
+/*global describe, it, expect, beforeAll, beforeEach, afterEach, awaitsForDone, awaitsFor, spyOn */
+
+define(function (require, exports, module) {
+    const SpecRunnerUtils = require("spec/SpecRunnerUtils"),
+        FileSystemError = require("filesystem/FileSystemError");
+
+    describe("integration:JavaScript hint initialization", function () {
+        let testWindow, FileSystem, ScopeManager, EditorManager, Session, testFolder;
+
+        beforeAll(async function () {
+            testWindow = await SpecRunnerUtils.createTestWindowAndRun();
+            FileSystem = testWindow.brackets.test.FileSystem;
+            EditorManager = testWindow.brackets.test.EditorManager;
+            ScopeManager = testWindow.brackets.getModule("JSUtils/ScopeManager");
+            Session = testWindow.brackets.getModule("JSUtils/Session");
+        }, 30000);
+
+        beforeEach(async function () {
+            testFolder = await SpecRunnerUtils.getTempTestDirectory("/spec/TypeScriptSupport-test-files/html", true);
+            await SpecRunnerUtils.loadProjectInTestWindow(testFolder);
+        });
+
+        afterEach(async function () {
+            await SpecRunnerUtils.closeTestWindow();
+            await Phoenix.VFS.unlinkAsync(testFolder);
+        });
+
+        /**
+         * Hold preference-file lookups to control the order of project initialization.
+         * @return {{callbacks: Array<Function>, restore: Function}} Pending lookups and cleanup.
+         */
+        function holdPreferenceReads() {
+            const callbacks = [];
+            const resolve = FileSystem.resolve;
+            const lookup = spyOn(FileSystem, "resolve").and.callFake(function (filePath, callback) {
+                if (filePath.endsWith("/.jscodehints")) {
+                    callbacks.push(callback);
+                    return;
+                }
+                return resolve.apply(this, arguments);
+            });
+            return {
+                callbacks,
+                restore: function () {
+                    lookup.and.callThrough();
+                    callbacks.splice(0).forEach(callback => callback(FileSystemError.NOT_FOUND));
+                }
+            };
+        }
+
+        it("should ignore an obsolete project preference lookup", function () {
+            const reads = holdPreferenceReads();
+            try {
+                ScopeManager.handleProjectOpen();
+                const previous = ScopeManager._readyPromise();
+                ScopeManager.handleProjectOpen();
+                const current = ScopeManager._readyPromise();
+                expect(previous.state()).toBe("rejected");
+                reads.callbacks.shift()(FileSystemError.NOT_FOUND);
+                expect(current.state()).toBe("pending");
+                reads.restore();
+                expect(current.state()).toBe("resolved");
+            } finally {
+                reads.restore();
+            }
+        });
+
+        it("should provide hints after project preferences interrupt editor initialization", async function () {
+            const reads = holdPreferenceReads();
+            try {
+                ScopeManager.handleProjectOpen();
+                const onPreferencesReady = spyOn(ScopeManager._readyPromise(), "done").and.callThrough();
+                await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.html"]), "open embedded script");
+                const editor = EditorManager.getCurrentFullEditor();
+                editor.setCursorPos(6, 4);
+                const session = new Session(editor);
+                ScopeManager.handleEditorChange(session, editor.document, null);
+                await awaitsFor(() => onPreferencesReady.calls.count() > 0,
+                    "editor initialization to wait for preferences");
+                expect(ScopeManager._readyPromise().state()).toBe("pending");
+
+                ScopeManager.handleProjectOpen();
+                reads.restore();
+                ScopeManager.handleEditorChange(session, editor.document, null);
+                const hints = ScopeManager.requestHints(session, editor.document);
+                await awaitsFor(() => hints.state() !== "pending", "hints after interrupted initialization", 5000);
+                await awaitsForDone(hints, "hints after interrupted initialization");
+                expect(session.ternHints.some(hint => hint.value === "push")).toBeTrue();
+            } finally {
+                reads.restore();
+            }
+        });
+    });
+});
diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js
index 6b87168f93..e579c73ae4 100644
--- a/test/spec/SpecRunnerUtils.js
+++ b/test/spec/SpecRunnerUtils.js
@@ -54,6 +54,32 @@ define(function (require, exports, module) {
 
     MainViewManager._initialize($("#mock-main-view"));
 
+    // Test-only orphan cleanup: refresh well before the Node idle timeout.
+    const NODE_IDLE_EXIT_MS = 120000;
+    const NODE_HEARTBEAT_MS = 30000;
+
+    /**
+     * Refresh the idle-exit watchdogs for this runner and its test window.
+     * A beforeunload terminate write can be lost, so abandoned engines need a fallback.
+     * Sleep or page suspension can also stop heartbeats and cause a false Node crash
+     * dialog after wake. This tradeoff is accepted only for tests: normal editor
+     * sessions must leave the watchdog disabled (see src-node/index.js for history).
+     *
+     * @returns {void}
+     */
+    function _keepNodeEnginesAlive() {
+        [window, _testWindow].forEach(function (win) {
+            if (win && win.PhNodeEngine && win.PhNodeEngine.setIdleExit) {
+                try {
+                    win.PhNodeEngine.setIdleExit(NODE_IDLE_EXIT_MS);
+                } catch (e) {
+                    // a window mid-teardown is exactly the case we want reaped
+                }
+            }
+        });
+    }
+    setInterval(_keepNodeEnginesAlive, NODE_HEARTBEAT_MS);
+
     // When the test runner page reloads (e.g. switching test
     // categories), terminate the test window's Node engine so
     // its phnode.exe process and children (ESLint runners,
@@ -741,6 +767,18 @@ define(function (require, exports, module) {
                 _testWindow = testIframe.contentWindow;
             }
         } else if(!_testWindow.brackets || !_testWindow.executeCommand){
+            // Navigating away abandons this window's Node engine. Tauri, not the
+            // webview, owns that child process and holds its stdin open, so nothing
+            // closes it on its own - src-node only exits on an explicit terminate or
+            // when stdin closes. Reap it here or it outlives the run as an orphan,
+            // still holding its LSP servers.
+            if(_testWindow.PhNodeEngine){
+                try {
+                    _testWindow.PhNodeEngine.terminateNode();
+                } catch (e) {
+                    // the window may already be too far gone to ask
+                }
+            }
             _testWindow.location.href = 'about:blank';
             _testWindow.location.href = _testWindowURL;
         } else {
diff --git a/test/spec/md-editor-integ-test.js b/test/spec/md-editor-integ-test.js
index 38ef542743..ad10bb8425 100644
--- a/test/spec/md-editor-integ-test.js
+++ b/test/spec/md-editor-integ-test.js
@@ -1290,16 +1290,31 @@ define(function (require, exports, module) {
                 const viewer = mdDoc.querySelector(".app-viewer");
                 const editor = EditorManager.getActiveEditor();
 
-                // Set cursor to line 0 — viewer should scroll to top
-                editor.setCursorPos(0, 0);
-                await awaitsFor(() => viewer.scrollTop < 50,
+                // Opening long.md is a file switch, and for 500ms after one the viewer
+                // drops every cursor scroll request (bridge.js, _suppressScrollToLine) so
+                // it can restore the cached scroll position undisturbed. Moving the cursor
+                // once, when the steps above finish inside that window, sent a request
+                // that was dropped and never repeated - which is why this failed on a fast
+                // run and passed on a slow one. So keep moving it, between two neighbouring
+                // lines so each poll is a fresh cursor move and a fresh request, until the
+                // viewer answers: the first request after the window closes is honoured.
+                function _moveCursorUntil(lineA, lineB, done, message) {
+                    let flip = false;
+                    return awaitsFor(() => {
+                        flip = !flip;
+                        editor.setCursorPos(flip ? lineA : lineB, 0);
+                        return done();
+                    }, message, 5000);
+                }
+
+                // Cursor at the top — viewer should scroll to the top
+                await _moveCursorUntil(0, 1, () => viewer.scrollTop < 50,
                     "viewer to scroll near top when CM cursor at line 0");
                 const topScroll = viewer.scrollTop;
 
-                // Set cursor to last line — viewer should scroll down
+                // Cursor at the end — viewer should scroll down
                 const lastLine = editor.lineCount() - 1;
-                editor.setCursorPos(lastLine, 0);
-                await awaitsFor(() => viewer.scrollTop > topScroll + 100,
+                await _moveCursorUntil(lastLine, lastLine - 1, () => viewer.scrollTop > topScroll + 100,
                     "viewer to scroll down when CM cursor moves to last line");
             }, 10000);
 

From 74ae3cfaf78972ac98cdcd1882f65bf65fe05b38 Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Wed, 30 Sep 2026 18:01:00 +0530
Subject: [PATCH 2/8] chore: update pro deps

---
 tracking-repos.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracking-repos.json b/tracking-repos.json
index c88af5a5ef..4c1af418b6 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "1792b00e8ee3695b7ab5d2d015906dee538054a2"
+    "commitID": "24695997878195f3499c60e453060591f6079b18"
   }
 }

From 82c672ac7002c4abf0c34f3e16757df94a804e5c Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Wed, 30 Sep 2026 20:37:55 +0530
Subject: [PATCH 3/8] fix: stabilize JavaScript hints and desktop tests

Serialize queued Tern initializations and finish background indexing when
directories disappear. Exclude HTML/PHP host markup from background parsing
and supply extracted JavaScript with completion requests.

Add initialization regressions, improve completion timeout diagnostics, and
clean up fake-clock toast transitions. Pin Pro to the tested Design Mode,
dialog, and locale fixes.

Validated macOS Tauri categories: unit 2905, integration 1106 twice,
LegacyInteg 556, livepreview 279, and mainview 307. Lint passed.
---
 src/JSUtils/ScopeManager.js                   |  50 ++++--
 src/JSUtils/Session.js                        |   7 +-
 .../default/TypeScriptSupport/unittests.js    |   8 +-
 test/spec/NotificationUI-test.js              |  12 +-
 test/spec/ScopeManager-integ-test.js          | 151 +++++++++++++++++-
 tracking-repos.json                           |   2 +-
 6 files changed, 205 insertions(+), 25 deletions(-)

diff --git a/src/JSUtils/ScopeManager.js b/src/JSUtils/ScopeManager.js
index c7ecfa1cbd..f8421580bc 100644
--- a/src/JSUtils/ScopeManager.js
+++ b/src/JSUtils/ScopeManager.js
@@ -378,16 +378,31 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Get the text of a document, applying any size restrictions
-     * if necessary
+     * Prepare a background file read or update for Tern's JavaScript parser.
+     * HTML and PHP start empty: getFileInfo() supplies their extracted scripts with each hint
+     * request. Parsing host markup here can throw and strand Tern's pending reads.
+     * @private
+     * @param {string} path - full path of the file.
+     * @param {string} text - unfiltered file contents.
+     * @return {string} JavaScript source, or an empty placeholder for HTML/PHP.
+     */
+    function filterTernFileText(path, text) {
+        const languageId = LanguageManager.getLanguageForPath(path).getId();
+        if (languageId === "html" || languageId === "php") {
+            return "";
+        }
+        return filterText(text);
+    }
+
+    /**
+     * Get a document's source for a background Tern update, excluding host markup
+     * and applying the configured size limit.
      * @private
      * @param {Document} document - the document to get the text from
-     * @return {string} the text, or the empty text if the original was too long
+     * @return {string} JavaScript source, or empty text for HTML/PHP or an oversized file.
      */
     function getTextFromDocument(document) {
-        var text = document.getText();
-        text = filterText(text);
-        return text;
+        return filterTernFileText(document.file.fullPath, document.getText());
     }
 
     /**
@@ -606,14 +621,14 @@ define(function (require, exports, module) {
      * @return {{type: string, name: string, offsetLines: number, text: string}}
      */
     function getFileInfo(session, preventPartialUpdates) {
+        const languageId = LanguageManager.getLanguageForPath(session.editor.document.file.fullPath).getId();
         var start = session.getCursor(),
             end = start,
             document = session.editor.document,
             path = document.file.fullPath,
-            isHtmlFile = LanguageManager.getLanguageForPath(path).getId() === "html",
             result;
 
-        if (isHtmlFile) {
+        if (languageId === "html" || languageId === "php") {
             result = {type: MessageIds.TERN_FILE_INFO_TYPE_FULL,
                 name: path,
                 text: session.getJavascriptText()};
@@ -946,7 +961,7 @@ define(function (require, exports, module) {
                 promise.done(function (docText) {
                     resolvedFiles[name] = filePath;
                     numResolvedFiles++;
-                    replyWith(name, filterText(docText));
+                    replyWith(name, filterTernFileText(filePath, docText));
                 });
                 return promise;
             }
@@ -1075,8 +1090,8 @@ define(function (require, exports, module) {
          *  to tern.
          * @private
          * @param {string} dir - the root directory to add.
-         * @param {function ()} doneCallback - called when all files have been
-         * added to tern.
+         * @param {function ()} doneCallback - called when traversal finishes, including
+         * when the directory can no longer be resolved.
          */
         function addAllFilesAndSubdirectories(dir, doneCallback) {
             FileSystem.resolve(dir, function (err, directory) {
@@ -1093,6 +1108,9 @@ define(function (require, exports, module) {
                 }
 
                 if (err) {
+                    // The directory can disappear before background indexing starts.
+                    // Release initialization so later editors do not wait on it indefinitely.
+                    doneCallback();
                     return;
                 }
 
@@ -1326,12 +1344,14 @@ define(function (require, exports, module) {
          * @param {?Document} previousDocument - the document of the editor is changing from
          */
         function handleEditorChange(session, document, previousDocument) {
-            if (addFilesPromise === null) {
-                doEditorChange(session, document, previousDocument);
-            } else {
+            if (addFilesPromise && addFilesPromise.state() === "pending") {
                 addFilesPromise.done(function () {
-                    doEditorChange(session, document, previousDocument);
+                    // An earlier queued editor may have started another initialization.
+                    // Recheck the current promise so only one worker-ready handler owns it.
+                    handleEditorChange(session, document, previousDocument);
                 });
+            } else {
+                doEditorChange(session, document, previousDocument);
             }
         }
 
diff --git a/src/JSUtils/Session.js b/src/JSUtils/Session.js
index 3c91377299..2dc5d9e987 100644
--- a/src/JSUtils/Session.js
+++ b/src/JSUtils/Session.js
@@ -742,15 +742,16 @@ define(function (require, exports, module) {
 
     /**
      * Get the javascript text of the file open in the editor for this Session.
-     * For a javascript file, this is just the text of the file.  For an HTML file,
+     * For a javascript file, this is just the text of the file.  For an HTML/PHP file,
      * this will be only the text in the script tags.  This is so that we can pass
      * just the javascript text to tern, and avoid confusing it with HTML tags, since it
      * only knows how to parse javascript.
      * @return {String} - the "javascript" text that can be sent to Tern.
      */
     Session.prototype.getJavascriptText = function () {
-        if (LanguageManager.getLanguageForPath(this.editor.document.file.fullPath).getId() === "html") {
-            // HTML file - need to send back only the bodies of the
+        const languageId = LanguageManager.getLanguageForPath(this.editor.document.file.fullPath).getId();
+        if (languageId === "html" || languageId === "php") {
+            // HTML/PHP file - need to send back only the bodies of the
             // script tags
             var text = "",
                 editor = this.editor,
diff --git a/src/extensions/default/TypeScriptSupport/unittests.js b/src/extensions/default/TypeScriptSupport/unittests.js
index ee8bda0035..f87b64dba7 100644
--- a/src/extensions/default/TypeScriptSupport/unittests.js
+++ b/src/extensions/default/TypeScriptSupport/unittests.js
@@ -430,24 +430,28 @@ define(function (require, exports, module) {
             const jsCodeHints = await new Promise(function (resolve, reject) {
                 ExtensionLoader.getRequireContextForExtension("JavaScriptCodeHints")(["main"], resolve, reject);
             });
-            let hintText = "";
+            let hintText = "", hintState = "not requested";
             await awaitsFor(async function () {
                 if (!jsCodeHints.jsHintProvider.hasHints(editor, null)) {
+                    hintState = "provider declined the editor context";
                     return false; // Tern session/worker may still be starting up
                 }
                 // The provider returns a Deferred for fresh hints and an object for
                 // cached hints. Await either result before checking this request.
                 let result;
                 try {
+                    hintState = "waiting for the Tern response";
                     result = await jsCodeHints.jsHintProvider.getHints(null);
                 } catch (err) {
+                    hintState = "request rejected: " + String(err);
                     return false; // A project/session change can cancel a pending request.
                 }
                 hintText = ((result && result.hints) || []).map(function (h) {
                     return $(h).text();
                 }).join("|");
+                hintState = "returned hints: " + hintText;
                 return hintText.indexOf("push") !== -1;
-            }, "Tern Array-member completions at arr. inside the <script>", 30000, 500);
+            }, () => "Tern Array-member completions at arr. inside the <script>: " + hintState, 30000, 500);
             expect(hintText).toContain("push");
 
             await awaitsForDone(CommandManager.execute(Commands.FILE_CLOSE, { _forceClose: true }),
diff --git a/test/spec/NotificationUI-test.js b/test/spec/NotificationUI-test.js
index 8008250854..abac11ea23 100644
--- a/test/spec/NotificationUI-test.js
+++ b/test/spec/NotificationUI-test.js
@@ -110,10 +110,11 @@ define(function (require, exports, module) {
             // Mock time from the start so the auto-close timer itself is under the clock. The close
             // itself is observed on the notification, since the removal waits for a CSS transition.
             jasmine.clock().install();
+            let notification, $popup;
             try {
-                const notification = NotificationUI.createToastFromTemplate("hello", "world", {autoCloseTimeS: 1});
+                notification = NotificationUI.createToastFromTemplate("hello", "world", {autoCloseTimeS: 1});
+                $popup = notification.$notification;
                 spyOn(notification, "close").and.callThrough();
-                const $popup = $("#toast-notification-container").children().last();
                 expect($popup.length).toBe(1);
                 $popup.trigger("mouseenter");
                 jasmine.clock().tick(1500);
@@ -125,6 +126,13 @@ define(function (require, exports, module) {
                 jasmine.clock().tick(200);
                 expect(notification.close).toHaveBeenCalledWith(NotificationUI.CLOSE_REASON.TIMEOUT);
             } finally {
+                if (notification) {
+                    notification.close("test-cleanup");
+                    // The fake clock does not advance CSS transitions. Complete this
+                    // toast's removal so the next spec starts without a closing toast.
+                    $popup.trigger("transitionend");
+                    expect($popup[0].isConnected).toBeFalse();
+                }
                 jasmine.clock().uninstall();
             }
         });
diff --git a/test/spec/ScopeManager-integ-test.js b/test/spec/ScopeManager-integ-test.js
index 78fb20f17c..282ca11f7c 100644
--- a/test/spec/ScopeManager-integ-test.js
+++ b/test/spec/ScopeManager-integ-test.js
@@ -7,10 +7,11 @@
 
 define(function (require, exports, module) {
     const SpecRunnerUtils = require("spec/SpecRunnerUtils"),
-        FileSystemError = require("filesystem/FileSystemError");
+        FileSystemError = require("filesystem/FileSystemError"),
+        MessageIds = JSON.parse(require("text!JSUtils/MessageIds.json"));
 
     describe("integration:JavaScript hint initialization", function () {
-        let testWindow, FileSystem, ScopeManager, EditorManager, Session, testFolder;
+        let testWindow, FileSystem, ScopeManager, EditorManager, Session, IndexingWorker, testFolder;
 
         beforeAll(async function () {
             testWindow = await SpecRunnerUtils.createTestWindowAndRun();
@@ -18,6 +19,7 @@ define(function (require, exports, module) {
             EditorManager = testWindow.brackets.test.EditorManager;
             ScopeManager = testWindow.brackets.getModule("JSUtils/ScopeManager");
             Session = testWindow.brackets.getModule("JSUtils/Session");
+            IndexingWorker = testWindow.brackets.getModule("worker/IndexingWorker");
         }, 30000);
 
         beforeEach(async function () {
@@ -95,5 +97,150 @@ define(function (require, exports, module) {
                 reads.restore();
             }
         });
+
+        it("should finish initialization when a background directory disappears", async function () {
+            await SpecRunnerUtils.createTextFileAsync(testFolder + "/hints.js", "const arr = [1, 2, 3];\narr.");
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["hints.js"]), "open JavaScript fixture");
+            const editor = EditorManager.getCurrentFullEditor();
+            editor.setCursorPos(1, 4);
+            const session = new Session(editor);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "initialize Tern");
+
+            const directoryPath = editor.document.file.parentPath;
+            const resolve = FileSystem.resolve;
+            let directoryReads = 0, interruptedLookup;
+            const lookup = spyOn(FileSystem, "resolve").and.callFake(function (filePath, callback) {
+                if (filePath === directoryPath && ++directoryReads === 2) {
+                    // The first lookup initializes Tern. The second starts its background scan,
+                    // after the directory could have been deleted during a project switch.
+                    interruptedLookup = callback;
+                    callback(FileSystemError.NOT_FOUND);
+                    return;
+                }
+                return resolve.apply(this, arguments);
+            });
+            const ready = ScopeManager._maybeReset(session, editor.document, true);
+            try {
+                await awaitsFor(() => !!interruptedLookup, "background directory lookup");
+                await awaitsFor(() => ready.state() !== "pending", "initialization after a missing directory", 5000);
+                await awaitsForDone(ready, "initialization after a missing directory");
+                const hints = ScopeManager.requestHints(session, editor.document);
+                await awaitsForDone(hints, "hints after a missing directory");
+                expect(session.ternHints.some(hint => hint.value === "push")).toBeTrue();
+            } finally {
+                lookup.and.callThrough();
+                if (interruptedLookup && ready.state() === "pending") {
+                    // Release the injected failure even if an assertion fails, so subsequent
+                    // specs are not left behind the same unfinished initialization.
+                    resolve.call(FileSystem, directoryPath, interruptedLookup);
+                    await awaitsForDone(ready, "finish test cleanup");
+                }
+            }
+        });
+
+        it("should initialize HTML without parsing markup as JavaScript", async function () {
+            const worker = spyOn(IndexingWorker, "execPeer").and.callThrough();
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.html"]), "open embedded script");
+            const editor = EditorManager.getCurrentFullEditor();
+            editor.setCursorPos(6, 4);
+            const session = new Session(editor);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "embedded script hints");
+
+            const reads = worker.calls.allArgs().filter(args => args[0] === "invokeTernCommand" &&
+                args[1].type === MessageIds.TERN_GET_FILE_MSG && args[1].file.endsWith("/embedded.html"));
+            expect(reads.length).toBeGreaterThan(0);
+            reads.forEach(args => expect(args[1].text).not.toContain("<html>"));
+            expect(session.ternHints.some(hint => hint.value === "push")).toBeTrue();
+        });
+
+        it("should serialize editor changes queued behind initialization", async function () {
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.html"]), "open embedded script");
+            const editor = EditorManager.getCurrentFullEditor();
+            editor.setCursorPos(6, 4);
+            const session = new Session(editor);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "initialize Tern");
+
+            const documents = [];
+            for (const name of ["queued-a.html", "queued-b.html", "queued-c.html"]) {
+                const path = testFolder + "/" + name;
+                await SpecRunnerUtils.createTextFileAsync(path, editor.document.getText());
+                documents.push(await testWindow.brackets.test.DocumentManager.getDocumentForPath(path));
+            }
+
+            const directoryPath = editor.document.file.parentPath;
+            const resolve = FileSystem.resolve;
+            const callbacks = [];
+            const lookup = spyOn(FileSystem, "resolve").and.callFake(function (filePath, callback) {
+                if (filePath === directoryPath) {
+                    callbacks.push(callback);
+                    return;
+                }
+                return resolve.apply(this, arguments);
+            });
+            try {
+                documents.forEach(document => ScopeManager.handleEditorChange(session, document, null));
+                expect(callbacks.length).toBe(1);
+                resolve.call(FileSystem, directoryPath, callbacks.shift());
+                await awaitsFor(() => callbacks.length > 0, "next queued editor initialization");
+                // Waking several queued changes must start only the next initialization.
+                // Concurrent initializations replace each other's worker-ready handler.
+                expect(callbacks.length).toBe(1);
+            } finally {
+                // Fail held lookups before restoring them, including any cleanup queues.
+                while (callbacks.length) {
+                    callbacks.shift()(FileSystemError.NOT_FOUND);
+                }
+                lookup.and.callThrough();
+            }
+
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["queued-c.html"]), "open last queued editor");
+            const finalEditor = EditorManager.getCurrentFullEditor();
+            finalEditor.setCursorPos(6, 4);
+            const finalSession = new Session(finalEditor);
+            await awaitsForDone(ScopeManager.requestHints(finalSession, finalEditor.document), "hints after queued editors");
+            expect(finalSession.ternHints.some(hint => hint.value === "push")).toBeTrue();
+        });
+
+        it("should exclude markup when updating a dirty HTML document before switching editors", async function () {
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.html"]), "open embedded script");
+            const previousEditor = EditorManager.getCurrentFullEditor();
+            previousEditor.setCursorPos(6, 4);
+            await awaitsForDone(ScopeManager.requestHints(new Session(previousEditor), previousEditor.document),
+                "initialize embedded script");
+            await SpecRunnerUtils.createTextFileAsync(testFolder + "/other.html", previousEditor.document.getText());
+
+            const worker = spyOn(IndexingWorker, "execPeer").and.callThrough();
+            previousEditor.document.setText(previousEditor.document.getText() + "\n<!-- unsaved edit -->");
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["other.html"]), "switch embedded script");
+            const editor = EditorManager.getCurrentFullEditor();
+            editor.setCursorPos(6, 4);
+            const session = new Session(editor);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "hints after dirty HTML update");
+
+            const updates = worker.calls.allArgs().filter(args => args[0] === "invokeTernCommand" &&
+                args[1].type === MessageIds.TERN_UPDATE_FILE_MSG &&
+                args[1].path === previousEditor.document.file.fullPath);
+            expect(updates.length).toBeGreaterThan(0);
+            updates.forEach(args => expect(args[1].text).not.toContain("<html>"));
+            expect(session.ternHints.some(hint => hint.value === "push")).toBeTrue();
+        });
+
+        it("should analyze embedded JavaScript without sending PHP host code to Tern", async function () {
+            const html = await SpecRunnerUtils.readTextFileAsync(testFolder + "/embedded.html");
+            await SpecRunnerUtils.createTextFileAsync(testFolder + "/embedded.php", '<?php echo "header"; ?>\n' + html);
+            const worker = spyOn(IndexingWorker, "execPeer").and.callThrough();
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.php"]), "open PHP embedded script");
+            const editor = EditorManager.getCurrentFullEditor();
+            editor.setCursorPos(7, 4);
+            const session = new Session(editor);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "PHP embedded script hints");
+
+            const reads = worker.calls.allArgs().filter(args => args[0] === "invokeTernCommand" &&
+                args[1].type === MessageIds.TERN_GET_FILE_MSG && args[1].file.endsWith("/embedded.php"));
+            expect(reads.length).toBeGreaterThan(0);
+            reads.forEach(args => expect(args[1].text).not.toContain("<?php"));
+            expect(session.ternHints.some(hint => hint.value === "push")).toBeTrue();
+        });
+
     });
 });
diff --git a/tracking-repos.json b/tracking-repos.json
index 4c1af418b6..660e74dcd0 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "24695997878195f3499c60e453060591f6079b18"
+    "commitID": "c991a453739841abeeacf7711127df553e39578e"
   }
 }

From 84c3a7e07861a0f32b07726355687a76a58dbc8e Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Wed, 30 Sep 2026 20:46:41 +0530
Subject: [PATCH 4/8] chore: update pro deps

---
 tracking-repos.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracking-repos.json b/tracking-repos.json
index 660e74dcd0..4c1af418b6 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "c991a453739841abeeacf7711127df553e39578e"
+    "commitID": "24695997878195f3499c60e453060591f6079b18"
   }
 }

From ebce277ddf551220b109a31c7ea4825cc75f146b Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Wed, 30 Sep 2026 22:27:13 +0530
Subject: [PATCH 5/8] chore: update pro deps

---
 tracking-repos.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracking-repos.json b/tracking-repos.json
index 4c1af418b6..660e74dcd0 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "24695997878195f3499c60e453060591f6079b18"
+    "commitID": "c991a453739841abeeacf7711127df553e39578e"
   }
 }

From 1bb9d51cd7f740e46495652d61b88994c3ced14d Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Thu, 1 Oct 2026 00:02:17 +0530
Subject: [PATCH 6/8] chore: pin Pro usage meter test fix

Use the Pro revision that removes the usage tests' dependency on the Linux keyring.
---
 tracking-repos.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracking-repos.json b/tracking-repos.json
index 660e74dcd0..81d028be7a 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "c991a453739841abeeacf7711127df553e39578e"
+    "commitID": "c7c083811904228b97763134e12941da987640ab"
   }
 }

From e0e61f712f329a7a269c18fd5f696ea9a783fd3e Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Thu, 1 Oct 2026 08:09:40 +0530
Subject: [PATCH 7/8] 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.
---
 src-node/package-lock.json                    | 132 ++----------------
 src/JSUtils/ScopeManager.js                   |   4 +-
 .../documents/LiveDocument.js                 |  11 +-
 .../default/HTMLCodeHints/integ-tests.js      |  15 +-
 src/languageTools/DefaultProviders.js         |  12 +-
 .../builder-connect-dialog.html               |   4 +
 src/phoenix-builder/main.js                   |  12 +-
 src/search/QuickOpen.js                       |  11 +-
 test/UnitTestSuite.js                         |   1 +
 test/spec/Document-integ-test.js              |   7 +-
 test/spec/Extn-CollapseFolders-integ-test.js  |   5 +-
 test/spec/Extn-ESLint-integ-test.js           |  42 ++++--
 test/spec/Extn-JSONSupport-integ-test.js      |   5 +-
 test/spec/Extn-Tabbar-integ-test.js           |  33 +++--
 test/spec/InlineEditorProviders-integ-test.js |   6 +-
 test/spec/KeybindingManager-integ-test.js     |   2 +-
 test/spec/LanguageToolsQuickFix-test.js       |  63 +++++++++
 test/spec/LiveDevelopmentMultiBrowser-test.js |  21 +++
 test/spec/LowLevelFileIO-test.js              |  48 ++-----
 test/spec/PreferencesManager-integ-test.js    |   9 +-
 test/spec/QuickOpen-integ-test.js             |  23 +++
 test/spec/ScopeManager-integ-test.js          |  30 ++++
 test/spec/md-editor-integ-test.js             |  20 ++-
 tracking-repos.json                           |   2 +-
 24 files changed, 302 insertions(+), 216 deletions(-)
 create mode 100644 test/spec/LanguageToolsQuickFix-test.js

diff --git a/src-node/package-lock.json b/src-node/package-lock.json
index ccba61da88..484fd57899 100644
--- a/src-node/package-lock.json
+++ b/src-node/package-lock.json
@@ -86,9 +86,6 @@
             "cpu": [
                 "arm64"
             ],
-            "libc": [
-                "glibc"
-            ],
             "license": "SEE LICENSE IN LICENSE.md",
             "optional": true,
             "os": [
@@ -102,9 +99,6 @@
             "cpu": [
                 "arm64"
             ],
-            "libc": [
-                "musl"
-            ],
             "license": "SEE LICENSE IN LICENSE.md",
             "optional": true,
             "os": [
@@ -118,9 +112,6 @@
             "cpu": [
                 "x64"
             ],
-            "libc": [
-                "glibc"
-            ],
             "license": "SEE LICENSE IN LICENSE.md",
             "optional": true,
             "os": [
@@ -134,9 +125,6 @@
             "cpu": [
                 "x64"
             ],
-            "libc": [
-                "musl"
-            ],
             "license": "SEE LICENSE IN LICENSE.md",
             "optional": true,
             "os": [
@@ -195,7 +183,6 @@
             "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
             "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=6.9.0"
             }
@@ -216,7 +203,6 @@
             "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz",
             "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=18.14.1"
             },
@@ -497,7 +483,6 @@
             "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
             "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "mime-types": "^3.0.0",
                 "negotiator": "^1.0.0"
@@ -511,7 +496,6 @@
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
             "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -521,7 +505,6 @@
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
             "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "mime-db": "^1.54.0"
             },
@@ -538,7 +521,6 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
             "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -555,7 +537,6 @@
             "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
             "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "ajv": "^8.0.0"
             },
@@ -593,7 +574,6 @@
             "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz",
             "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "bytes": "^3.1.2",
                 "content-type": "^1.0.5",
@@ -649,7 +629,6 @@
             "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
             "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -659,7 +638,6 @@
             "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
             "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "es-errors": "^1.3.0",
                 "function-bind": "^1.1.2"
@@ -673,7 +651,6 @@
             "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
             "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.2",
                 "get-intrinsic": "^1.3.0"
@@ -716,7 +693,6 @@
             "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz",
             "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=18"
             },
@@ -730,7 +706,6 @@
             "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
             "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -740,7 +715,6 @@
             "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
             "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -750,7 +724,6 @@
             "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
             "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=6.6.0"
             }
@@ -771,7 +744,6 @@
             "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
             "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "object-assign": "^4",
                 "vary": "^1"
@@ -830,7 +802,6 @@
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
             "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "ms": "^2.1.3"
             },
@@ -885,7 +856,6 @@
             "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
             "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -959,7 +929,6 @@
             "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
             "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.1",
                 "es-errors": "^1.3.0",
@@ -973,15 +942,13 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
             "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/encodeurl": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
             "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -1003,7 +970,6 @@
             "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
             "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.4"
             }
@@ -1013,7 +979,6 @@
             "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
             "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.4"
             }
@@ -1023,7 +988,6 @@
             "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
             "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "es-errors": "^1.3.0"
             },
@@ -1035,15 +999,13 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
             "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/etag": {
             "version": "1.8.1",
             "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
             "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -1053,7 +1015,6 @@
             "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
             "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "eventsource-parser": "^3.0.1"
             },
@@ -1066,7 +1027,6 @@
             "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.8.tgz",
             "integrity": "sha512-70QWGkr4snxr0OXLRWsFLeRBIRPuQOvt4s8QYjmUlmlkyTZkRqS7EDVRZtzU3TiyDbXSzaOeF0XUKy8PchzukQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=18.0.0"
             }
@@ -1076,7 +1036,6 @@
             "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
             "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "accepts": "^2.0.0",
                 "body-parser": "^2.2.1",
@@ -1120,7 +1079,6 @@
             "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz",
             "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "ip-address": "^10.2.0"
             },
@@ -1139,7 +1097,6 @@
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
             "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -1149,7 +1106,6 @@
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
             "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "mime-db": "^1.54.0"
             },
@@ -1165,8 +1121,7 @@
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/fast-uri": {
             "version": "3.1.2",
@@ -1182,8 +1137,7 @@
                     "url": "https://opencollective.com/fastify"
                 }
             ],
-            "license": "BSD-3-Clause",
-            "peer": true
+            "license": "BSD-3-Clause"
         },
         "node_modules/fill-range": {
             "version": "7.1.1",
@@ -1201,7 +1155,6 @@
             "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz",
             "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "debug": "^4.4.0",
                 "encodeurl": "^2.0.0",
@@ -1223,7 +1176,6 @@
             "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
             "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -1233,7 +1185,6 @@
             "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
             "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -1256,7 +1207,6 @@
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
             "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
             "license": "MIT",
-            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -1266,7 +1216,6 @@
             "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
             "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.2",
                 "es-define-property": "^1.0.1",
@@ -1291,7 +1240,6 @@
             "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
             "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "dunder-proto": "^1.0.1",
                 "es-object-atoms": "^1.0.0"
@@ -1316,7 +1264,6 @@
             "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
             "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.4"
             },
@@ -1329,7 +1276,6 @@
             "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
             "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.4"
             },
@@ -1342,7 +1288,6 @@
             "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
             "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "function-bind": "^1.1.2"
             },
@@ -1374,7 +1319,6 @@
             "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
             "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "depd": "~2.0.0",
                 "inherits": "~2.0.4",
@@ -1395,7 +1339,6 @@
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
             "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3.0.0"
             },
@@ -1419,15 +1362,13 @@
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "license": "ISC",
-            "peer": true
+            "license": "ISC"
         },
         "node_modules/ip-address": {
             "version": "10.2.0",
             "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
             "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 12"
             }
@@ -1437,7 +1378,6 @@
             "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
             "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.10"
             }
@@ -1515,8 +1455,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
             "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/is-wsl": {
             "version": "3.1.0",
@@ -1542,7 +1481,6 @@
             "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz",
             "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==",
             "license": "MIT",
-            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/panva"
             }
@@ -1552,7 +1490,6 @@
             "resolved": "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-3.1.1.tgz",
             "integrity": "sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@babel/runtime": "^7.18.3",
                 "ts-algebra": "^2.0.0"
@@ -1565,15 +1502,13 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
             "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/json-schema-typed": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
             "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
-            "license": "BSD-2-Clause",
-            "peer": true
+            "license": "BSD-2-Clause"
         },
         "node_modules/jsonc-parser": {
             "version": "3.3.1",
@@ -1625,7 +1560,6 @@
             "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
             "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.4"
             }
@@ -1635,7 +1569,6 @@
             "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
             "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -1645,7 +1578,6 @@
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
             "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=18"
             },
@@ -1676,8 +1608,7 @@
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/msgpackr": {
             "version": "1.11.8",
@@ -1715,7 +1646,6 @@
             "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
             "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -3593,6 +3523,7 @@
             "version": "4.0.3",
             "inBundle": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -3730,7 +3661,6 @@
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
             "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3740,7 +3670,6 @@
             "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
             "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.4"
             },
@@ -3753,7 +3682,6 @@
             "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
             "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "ee-first": "1.1.1"
             },
@@ -3766,7 +3694,6 @@
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
             "license": "ISC",
-            "peer": true,
             "dependencies": {
                 "wrappy": "1"
             }
@@ -3799,7 +3726,6 @@
             "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
             "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -3817,7 +3743,6 @@
             "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
             "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==",
             "license": "MIT",
-            "peer": true,
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/express"
@@ -3839,7 +3764,6 @@
             "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz",
             "integrity": "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=16.20.0"
             }
@@ -3849,7 +3773,6 @@
             "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
             "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "forwarded": "0.2.0",
                 "ipaddr.js": "1.9.1"
@@ -3863,7 +3786,6 @@
             "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.1.tgz",
             "integrity": "sha512-6YHEFRL9mfgcAvql/XhwTvf5jKcOiiupt2FiJxHkiX1z4j7WL8J/jRHYLluORvc1XxB5rV20KoeK00gVJamspg==",
             "license": "BSD-3-Clause",
-            "peer": true,
             "dependencies": {
                 "side-channel": "^1.1.0"
             },
@@ -3879,7 +3801,6 @@
             "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
             "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -3889,7 +3810,6 @@
             "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz",
             "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "bytes": "~3.1.2",
                 "http-errors": "~2.0.1",
@@ -3928,7 +3848,6 @@
             "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
             "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -3938,7 +3857,6 @@
             "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
             "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "debug": "^4.4.0",
                 "depd": "^2.0.0",
@@ -3965,8 +3883,7 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/semver": {
             "version": "7.5.2",
@@ -3988,7 +3905,6 @@
             "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz",
             "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "debug": "^4.4.3",
                 "encodeurl": "^2.0.0",
@@ -4015,7 +3931,6 @@
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
             "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -4025,7 +3940,6 @@
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
             "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "mime-db": "^1.54.0"
             },
@@ -4042,7 +3956,6 @@
             "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz",
             "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "encodeurl": "^2.0.0",
                 "escape-html": "^1.0.3",
@@ -4061,8 +3974,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
             "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-            "license": "ISC",
-            "peer": true
+            "license": "ISC"
         },
         "node_modules/shebang-command": {
             "version": "2.0.0",
@@ -4088,7 +4000,6 @@
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
             "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "es-errors": "^1.3.0",
                 "object-inspect": "^1.13.3",
@@ -4108,7 +4019,6 @@
             "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
             "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "es-errors": "^1.3.0",
                 "object-inspect": "^1.13.4"
@@ -4125,7 +4035,6 @@
             "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
             "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "call-bound": "^1.0.2",
                 "es-errors": "^1.3.0",
@@ -4144,7 +4053,6 @@
             "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
             "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "call-bound": "^1.0.2",
                 "es-errors": "^1.3.0",
@@ -4164,7 +4072,6 @@
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
             "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -4185,7 +4092,6 @@
             "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
             "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=0.6"
             }
@@ -4194,15 +4100,13 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-2.0.0.tgz",
             "integrity": "sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==",
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/type-is": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz",
             "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "content-type": "^2.0.0",
                 "media-typer": "^1.1.0",
@@ -4221,7 +4125,6 @@
             "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz",
             "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=18"
             },
@@ -4235,7 +4138,6 @@
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
             "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.6"
             }
@@ -4245,7 +4147,6 @@
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
             "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "mime-db": "^1.54.0"
             },
@@ -4275,7 +4176,6 @@
             "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
             "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -4285,7 +4185,6 @@
             "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
             "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">= 0.8"
             }
@@ -4521,8 +4420,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
             "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "license": "ISC",
-            "peer": true
+            "license": "ISC"
         },
         "node_modules/ws": {
             "version": "8.17.1",
@@ -4556,6 +4454,7 @@
             "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
             "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
             "license": "MIT",
+            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
@@ -4565,7 +4464,6 @@
             "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz",
             "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==",
             "license": "ISC",
-            "peer": true,
             "peerDependencies": {
                 "zod": "^3.25.28 || ^4"
             }
diff --git a/src/JSUtils/ScopeManager.js b/src/JSUtils/ScopeManager.js
index f8421580bc..3b0cd5d9bd 100644
--- a/src/JSUtils/ScopeManager.js
+++ b/src/JSUtils/ScopeManager.js
@@ -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);
             }
 
diff --git a/src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js b/src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js
index 0538382595..a17b5b3e75 100644
--- a/src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js
+++ b/src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.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;
+                }
+            });
     };
 
     /**
diff --git a/src/extensions/default/HTMLCodeHints/integ-tests.js b/src/extensions/default/HTMLCodeHints/integ-tests.js
index a80521f011..b5f4caa5e2 100644
--- a/src/extensions/default/HTMLCodeHints/integ-tests.js
+++ b/src/extensions/default/HTMLCodeHints/integ-tests.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) {
diff --git a/src/languageTools/DefaultProviders.js b/src/languageTools/DefaultProviders.js
index 4d808837f0..1c233bf1be 100644
--- a/src/languageTools/DefaultProviders.js
+++ b/src/languageTools/DefaultProviders.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;
diff --git a/src/phoenix-builder/builder-connect-dialog.html b/src/phoenix-builder/builder-connect-dialog.html
index 5663fadf2f..2e786b27f8 100644
--- a/src/phoenix-builder/builder-connect-dialog.html
+++ b/src/phoenix-builder/builder-connect-dialog.html
@@ -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>
diff --git a/src/phoenix-builder/main.js b/src/phoenix-builder/main.js
index cd8ff7d290..185b263408 100644
--- a/src/phoenix-builder/main.js
+++ b/src/phoenix-builder/main.js
@@ -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") + "-" +
diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js
index 07493c0ea4..987d76089a 100644
--- a/src/search/QuickOpen.js
+++ b/src/search/QuickOpen.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.
diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js
index ecace4a2c8..2d0d1b744d 100644
--- a/test/UnitTestSuite.js
+++ b/test/UnitTestSuite.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");
diff --git a/test/spec/Document-integ-test.js b/test/spec/Document-integ-test.js
index 1718cf0e91..202f4654fd 100644
--- a/test/spec/Document-integ-test.js
+++ b/test/spec/Document-integ-test.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 () {
diff --git a/test/spec/Extn-CollapseFolders-integ-test.js b/test/spec/Extn-CollapseFolders-integ-test.js
index b4bec85493..e9116cdc53 100644
--- a/test/spec/Extn-CollapseFolders-integ-test.js
+++ b/test/spec/Extn-CollapseFolders-integ-test.js
@@ -87,8 +87,9 @@ define(function (require, exports, module) {
          */
         async function openFolder(folderPath) {
             const folderEntry = FileSystem.getDirectoryForPath(folderPath);
-            // Call setDirectoryOpen without awaitsForDone since it doesn't return a promise
-            ProjectManager._actionCreator.setDirectoryOpen(folderEntry.fullPath, true);
+            // Fixture setup waits for the directory read before checking the rendered tree.
+            // The action creator discards this promise; the model exposes the actual completion.
+            await jsPromise(ProjectManager._actionCreator.model.setDirectoryOpen(folderEntry.fullPath, true));
 
             // Wait for the folder to be opened in the UI
             await awaitsFor(
diff --git a/test/spec/Extn-ESLint-integ-test.js b/test/spec/Extn-ESLint-integ-test.js
index 5eccf27b3f..ea45a0f3a9 100644
--- a/test/spec/Extn-ESLint-integ-test.js
+++ b/test/spec/Extn-ESLint-integ-test.js
@@ -28,6 +28,7 @@ define(function (require, exports, module) {
 
     describe("integration:ESLint", function () {
         const testRootSpec = "/spec/ESLintExtensionTest-files/";
+        const installFixtureRoot = SpecRunnerUtils.getTempDirectory() + "/eslint";
         let testProjectsFolder = SpecRunnerUtils.getTestPath(testRootSpec),
             Strings     = require("strings"),
             testWindow,
@@ -64,6 +65,9 @@ define(function (require, exports, module) {
             CommandManager = null;
             Commands = null;
             await SpecRunnerUtils.closeTestWindow();
+            if (Phoenix.isNativeApp) {
+                await SpecRunnerUtils.deletePathAsync(installFixtureRoot, true);
+            }
         }, 30000);
 
         const JSHintErrorES6Error_js = "Missing semicolon. jshint (W033)",
@@ -71,17 +75,39 @@ define(function (require, exports, module) {
             ESLintErrorES8Error_js = "Expected '===' and instead saw '=='. ESLint (eqeqeq)",
             ESLintReactError_js = "'element' is assigned a value but never used. ESLint (no-unused-vars)";
 
+        /**
+         * Copy one install fixture without deleting projects still used by other Node processes.
+         * @param {string} esLintSpecSubFolder Fixture directory name.
+         * @return {Promise<string>} Editable project path.
+         */
         async function _createTempProject(esLintSpecSubFolder) {
-            return await SpecRunnerUtils.getTempTestDirectory(testRootSpec + esLintSpecSubFolder);
+            const projectPath = installFixtureRoot + "/" + esLintSpecSubFolder;
+            await SpecRunnerUtils.deletePathAsync(projectPath, true);
+            await awaitsForDone(SpecRunnerUtils.copyPath(testProjectsFolder + esLintSpecSubFolder, projectPath),
+                "copy ESLint " + esLintSpecSubFolder + " fixture");
+            return projectPath;
         }
 
         async function _openProjectFile(fileName) {
             await awaitsForDone(SpecRunnerUtils.openProjectFiles([fileName]), "opening "+ fileName);
         }
 
+        /**
+         * Install dependencies, cancelling npm before the setup hook's timeout can leave it running.
+         * @param {string} folder Fixture VFS path.
+         * @return {Promise<void>}
+         */
         async function _npmInstallInFolder(folder) {
             const npmInstallPlatformPath = Phoenix.fs.getTauriPlatformPath(folder);
-            await NodeUtils._npmInstallInFolder(npmInstallPlatformPath);
+            const install = NodeUtils._npmInstallInFolder(npmInstallPlatformPath);
+            const timer = setTimeout(function () {
+                install.cancel().catch(error => console.error("Could not cancel fixture npm install", error));
+            }, 90000);
+            try {
+                await install;
+            } finally {
+                clearTimeout(timer);
+            }
         }
 
         async function _waitForProblemsPanelVisible(visible) {
@@ -180,7 +206,7 @@ define(function (require, exports, module) {
                 es6ProjectPath = await _createTempProject("es6");
                 await _npmInstallInFolder(es6ProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(es6ProjectPath);
-            }, 30000);
+            }, 120000);
 
             async function _loadAndValidateES6Project() {
                 await _openProjectFile("error.js");
@@ -212,7 +238,7 @@ define(function (require, exports, module) {
                 es7ProjectPath = await _createTempProject("es7_JSHint");
                 await _npmInstallInFolder(es7ProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(es7ProjectPath);
-            }, 30000);
+            }, 120000);
 
             async function _loadAndValidateES7Project() {
                 await _openProjectFile("error.js");
@@ -242,7 +268,7 @@ define(function (require, exports, module) {
                 reactProjectPath = await _createTempProject("es8_react_jsx");
                 await _npmInstallInFolder(reactProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(reactProjectPath);
-            }, 30000);
+            }, 120000);
 
             it("should ESLint jsx reactjs in v8 work as expected", async function () {
                 await _openProjectFile("react.jsx");
@@ -263,7 +289,7 @@ define(function (require, exports, module) {
                 es7ProjectPath = await _createTempProject("es8_module");
                 await _npmInstallInFolder(es7ProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(es7ProjectPath);
-            }, 30000);
+            }, 120000);
 
             async function _loadAndValidateES8Project() {
                 await _openProjectFile("error.js");
@@ -336,7 +362,7 @@ define(function (require, exports, module) {
                 configPath = path.join(esLatestProjectPath, CONFIG_FILE_NAME);
                 await _npmInstallInFolder(esLatestProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(esLatestProjectPath);
-            }, 30000);
+            }, 120000);
 
             let initDone = false;
             async function _loadAndValidateESLatestProject() {
@@ -398,7 +424,7 @@ define(function (require, exports, module) {
                 esLatestProjectPath = await _createTempProject("es9_with_fixes");
                 await _npmInstallInFolder(esLatestProjectPath);
                 await SpecRunnerUtils.loadProjectInTestWindow(esLatestProjectPath);
-            }, 30000);
+            }, 120000);
 
             beforeEach(async function () {
                 // Fixes are unsaved edits. Closing them restores the unchanged fixture
diff --git a/test/spec/Extn-JSONSupport-integ-test.js b/test/spec/Extn-JSONSupport-integ-test.js
index 3562fa4095..ab371d5b68 100644
--- a/test/spec/Extn-JSONSupport-integ-test.js
+++ b/test/spec/Extn-JSONSupport-integ-test.js
@@ -208,7 +208,10 @@ define(function (require, exports, module) {
                     PreferencesManager.set("codeIntelligence.json", true);
                 }
                 await awaitsFor(function () {
-                    return LSPClient.isLintingProviderActive("json");
+                    // Capabilities become available before initialization finishes and the
+                    // restart is announced. Wait for both parts of the restart contract.
+                    return LSPClient.isLintingProviderActive("json") &&
+                        auditSum("lsp.srv.Start.json") > startsBefore;
                 }, "json server to restart on pref on", 45000);
                 // re-enable is a return to the default - no pref metric, but the restart counts
                 expect(auditSum("lsp.srv.Start.json")).toBeGreaterThan(startsBefore);
diff --git a/test/spec/Extn-Tabbar-integ-test.js b/test/spec/Extn-Tabbar-integ-test.js
index 13329cf910..81ffd2376b 100644
--- a/test/spec/Extn-Tabbar-integ-test.js
+++ b/test/spec/Extn-Tabbar-integ-test.js
@@ -33,7 +33,7 @@ define(function (require, exports, module) {
             Commands,
             DocumentManager,
             Strings;
-        let testFilePath, testFilePath2, testFilePath3, testDuplicateDir1, testDuplicateDir2, testDuplicateName;
+        let testFolder, testFilePath, testFilePath2, testFilePath3, testDuplicateDir1, testDuplicateDir2, testDuplicateName;
 
         /**
          * Helper function to create multiple test files
@@ -45,7 +45,7 @@ define(function (require, exports, module) {
         async function createTestFiles(count, prefix, content) {
             const testFiles = [];
             for (let i = 0; i < count; i++) {
-                const filePath = SpecRunnerUtils.getTempDirectory() + `/${prefix}-${i}.js`;
+                const filePath = testFolder + `/${prefix}-${i}.js`;
                 testFiles.push(filePath);
                 await jsPromise(
                     SpecRunnerUtils.createTextFile(
@@ -245,17 +245,20 @@ define(function (require, exports, module) {
             DocumentManager = testWindow.brackets.test.DocumentManager;
             Strings = testWindow.Strings;
 
+            // Keep this suite's files separate so cleanup never walks or deletes another suite's fixtures.
+            testFolder = SpecRunnerUtils.getTempDirectory() + "/tabbar";
+
             // Create test files
-            testFilePath = SpecRunnerUtils.getTempDirectory() + "/tabbar-test.js";
-            testFilePath2 = SpecRunnerUtils.getTempDirectory() + "/tabbar-test2.js";
-            testFilePath3 = SpecRunnerUtils.getTempDirectory() + "/tabbar-test3.js";
+            testFilePath = testFolder + "/tabbar-test.js";
+            testFilePath2 = testFolder + "/tabbar-test2.js";
+            testFilePath3 = testFolder + "/tabbar-test3.js";
 
             // Create files with the same name in different directories for testing duplicate name handling
-            testDuplicateDir1 = SpecRunnerUtils.getTempDirectory() + "/dir1";
-            testDuplicateDir2 = SpecRunnerUtils.getTempDirectory() + "/dir2";
+            testDuplicateDir1 = testFolder + "/dir1";
+            testDuplicateDir2 = testFolder + "/dir2";
             testDuplicateName = "duplicate.js";
 
-            await SpecRunnerUtils.createTempDirectory();
+            await SpecRunnerUtils.ensureExistsDirAsync(testFolder);
             await SpecRunnerUtils.ensureExistsDirAsync(testDuplicateDir1);
             await SpecRunnerUtils.ensureExistsDirAsync(testDuplicateDir2);
 
@@ -290,7 +293,7 @@ define(function (require, exports, module) {
 
             testWindow = null;
             await SpecRunnerUtils.closeTestWindow();
-            await SpecRunnerUtils.removeTempDirectory();
+            await SpecRunnerUtils.deletePathAsync(testFolder, true);
         }, 5000);
 
         /**
@@ -2289,7 +2292,7 @@ define(function (require, exports, module) {
                 // Create several test files
                 const testFiles = [];
                 for (let i = 0; i < 10; i++) {
-                    const filePath = SpecRunnerUtils.getTempDirectory() + `/number-test-${i}.js`;
+                    const filePath = testFolder + `/number-test-${i}.js`;
                     testFiles.push(filePath);
                     await jsPromise(SpecRunnerUtils.createTextFile(filePath, `// Number test file ${i}`, FileSystem));
                 }
@@ -2329,7 +2332,7 @@ define(function (require, exports, module) {
                 // Create several test files
                 const testFiles = [];
                 for (let i = 0; i < 10; i++) {
-                    const filePath = SpecRunnerUtils.getTempDirectory() + `/number-test-${i}.js`;
+                    const filePath = testFolder + `/number-test-${i}.js`;
                     testFiles.push(filePath);
                     await jsPromise(SpecRunnerUtils.createTextFile(filePath, `// Number test file ${i}`, FileSystem));
                 }
@@ -2366,7 +2369,7 @@ define(function (require, exports, module) {
                 // First open some files with the default setting
                 const testFiles = [];
                 for (let i = 0; i < 3; i++) {
-                    const filePath = SpecRunnerUtils.getTempDirectory() + `/number-test-${i}.js`;
+                    const filePath = testFolder + `/number-test-${i}.js`;
                     testFiles.push(filePath);
                     await jsPromise(SpecRunnerUtils.createTextFile(filePath, `// Number test file ${i}`, FileSystem));
                 }
@@ -2423,7 +2426,7 @@ define(function (require, exports, module) {
                 // Create test files for first pane
                 const firstPaneFiles = [];
                 for (let i = 0; i < 5; i++) {
-                    const filePath = SpecRunnerUtils.getTempDirectory() + `/first-pane-${i}.js`;
+                    const filePath = testFolder + `/first-pane-${i}.js`;
                     firstPaneFiles.push(filePath);
                     await jsPromise(SpecRunnerUtils.createTextFile(filePath, `// First pane file ${i}`, FileSystem));
                 }
@@ -2431,7 +2434,7 @@ define(function (require, exports, module) {
                 // Create test files for second pane
                 const secondPaneFiles = [];
                 for (let i = 0; i < 5; i++) {
-                    const filePath = SpecRunnerUtils.getTempDirectory() + `/second-pane-${i}.js`;
+                    const filePath = testFolder + `/second-pane-${i}.js`;
                     secondPaneFiles.push(filePath);
                     await jsPromise(SpecRunnerUtils.createTextFile(filePath, `// Second pane file ${i}`, FileSystem));
                 }
@@ -2746,7 +2749,7 @@ define(function (require, exports, module) {
                 // Create multiple test files to ensure scrolling is needed
                 longTestFilePaths = [];
                 for (let i = 1; i <= 15; i++) {
-                    const filePath = SpecRunnerUtils.getTempDirectory() + `/scroll-test-file-${i}.js`;
+                    const filePath = testFolder + `/scroll-test-file-${i}.js`;
                     longTestFilePaths.push(filePath);
                     await jsPromise(
                         SpecRunnerUtils.createTextFile(filePath, `// Test file ${i} for scrolling`, FileSystem)
diff --git a/test/spec/InlineEditorProviders-integ-test.js b/test/spec/InlineEditorProviders-integ-test.js
index 5c59e6f2b4..8d95e14fd1 100644
--- a/test/spec/InlineEditorProviders-integ-test.js
+++ b/test/spec/InlineEditorProviders-integ-test.js
@@ -115,9 +115,11 @@ define(function (require, exports, module) {
                 var inlineWidgets = editor.getInlineWidgets();
                 expect(inlineWidgets.length).toBe(1);
 
-                // By the time we're called, the content of the widget should be in the DOM and have a nontrivial height.
+                // The open promise attaches the widget; its opening animation finishes later.
                 expect($.contains(testWindow.document.documentElement, inlineWidgets[0].htmlContent)).toBe(true);
-                expect(inlineWidgets[0].$htmlContent.height()).toBeGreaterThan(50);
+                await awaitsFor(function () {
+                    return inlineWidgets[0].$htmlContent.height() > 50;
+                }, "inline editor to expand");
             }
 
             editor = null;
diff --git a/test/spec/KeybindingManager-integ-test.js b/test/spec/KeybindingManager-integ-test.js
index e637c0883f..3784817086 100644
--- a/test/spec/KeybindingManager-integ-test.js
+++ b/test/spec/KeybindingManager-integ-test.js
@@ -204,8 +204,8 @@ define(function (require, exports, module) {
 
         it("Should be able to remove a shortcut", async function () {
             await editShortcut(Commands.EDIT_BEAUTIFY_CODE);
+            const existingBinding = KeyBindingManager.getKeyBindings(Commands.EDIT_BEAUTIFY_CODE);
             testWindow.$(".change-shortcut-dialog .Remove").click();
-            let existingBinding = KeyBindingManager.getKeyBindings(Commands.EDIT_BEAUTIFY_CODE);
             await awaitsFor(async ()=>{
                 try {
                     const textJson = JSON.parse(await _readKeyboardJson(KeyBindingManager._getUserKeyMapFilePath()));
diff --git a/test/spec/LanguageToolsQuickFix-test.js b/test/spec/LanguageToolsQuickFix-test.js
new file mode 100644
index 0000000000..7dd18ffa15
--- /dev/null
+++ b/test/spec/LanguageToolsQuickFix-test.js
@@ -0,0 +1,63 @@
+/*
+ * GNU AGPL-3.0 License
+ * Copyright (c) 2021 - present core.ai . All rights reserved.
+ */
+
+/*global describe, it, expect */
+
+define(function (require, exports, module) {
+    const DefaultProviders = require("languageTools/DefaultProviders");
+
+    describe("unit:Language server quickfix paths", function () {
+        /**
+         * Convert a single-edit action using simulated platform paths, without starting a server.
+         * @param {string} platform Phoenix platform id.
+         * @param {string} ownUri Active document URI.
+         * @param {string} editUri URI supplied in the server's edit.
+         * @return {?Object} Accepted fix, or null for a different file.
+         */
+        function fixForPaths(platform, ownUri, editUri) {
+            const originalPlatform = brackets.platform;
+            const provider = Object.create(DefaultProviders.LintingProvider.prototype);
+            provider._quickFixClient = {uriForPath: () => ownUri};
+            const action = {
+                title: "Change spelling to console",
+                kind: "quickfix",
+                edit: {changes: {[editUri]: [{
+                    range: {start: {line: 0, character: 0}, end: {line: 0, character: 6}},
+                    newText: "console"
+                }]}}
+            };
+            try {
+                brackets.platform = platform;
+                return provider._fixFromAction(action, {indexFromPos: pos => pos.ch}, "/test/fixable.ts");
+            } finally {
+                brackets.platform = originalPlatform;
+            }
+        }
+
+        it("accepts an encoded lowercase Windows drive for the same file", function () {
+            const fix = fixForPaths("win", "file:///C:/Project/fixable.ts", "file:///c%3A/Project/fixable.ts");
+            expect(fix).not.toBeNull();
+            if (fix) {
+                expect(fix.replaceText).toBe("console");
+                expect(fix.rangeOffset).toEqual({start: 0, end: 6});
+            }
+        });
+
+        it("rejects a Windows edit on another drive", function () {
+            expect(fixForPaths("win", "file:///C:/Project/fixable.ts", "file:///d%3A/Project/fixable.ts"))
+                .toBeNull();
+        });
+
+        it("rejects an edit to another file", function () {
+            expect(fixForPaths("win", "file:///C:/Project/fixable.ts", "file:///c%3A/Project/other.ts"))
+                .toBeNull();
+        });
+
+        it("preserves case distinctions in Unix paths", function () {
+            expect(fixForPaths("linux", "file:///Project/fixable.ts", "file:///project/fixable.ts"))
+                .toBeNull();
+        });
+    });
+});
diff --git a/test/spec/LiveDevelopmentMultiBrowser-test.js b/test/spec/LiveDevelopmentMultiBrowser-test.js
index 020495cfdf..3c060863b3 100644
--- a/test/spec/LiveDevelopmentMultiBrowser-test.js
+++ b/test/spec/LiveDevelopmentMultiBrowser-test.js
@@ -1430,6 +1430,27 @@ define(function (require, exports, module) {
             await endPreviewSession();
         }, 30000);
 
+        it("should highlight the same element after opening preview with a restored cursor", async function () {
+            await endPreviewSession();
+            try {
+                await awaitsForDone(SpecRunnerUtils.openProjectFiles(["simple1.html"]),
+                    "SpecRunnerUtils.openProjectFiles simple1.html");
+                const editor = EditorManager.getActiveEditor();
+                editor.setCursorPos({ line: 11, ch: 10 });
+
+                // Attaching the live document attempts to highlight this cursor before the
+                // preview connects. A failed send must not suppress later cursor updates.
+                LiveDevMultiBrowser.open();
+                await awaitsFor(() => LiveDevMultiBrowser.status === LiveDevMultiBrowser.STATUS_ACTIVE,
+                    "preview connected with a restored cursor", 20000);
+                editor.setCursorPos({ line: 11, ch: 11 });
+                await forRemoteExec("_LD.getHighlightCount()", result => result === 1);
+                await forRemoteExec("_LD.getHighlightTrackingElement(0).id", result => result === "testId");
+            } finally {
+                await endPreviewSession();
+            }
+        }, 30000);
+
         it("should live highlight resize as window size changes", async function () {
             await awaitsForDone(SpecRunnerUtils.openProjectFiles(["simple1.html"]),
                 "SpecRunnerUtils.openProjectFiles simple1.html");
diff --git a/test/spec/LowLevelFileIO-test.js b/test/spec/LowLevelFileIO-test.js
index 3ec05e1cfc..7d880a8374 100644
--- a/test/spec/LowLevelFileIO-test.js
+++ b/test/spec/LowLevelFileIO-test.js
@@ -530,40 +530,20 @@ define(function (require, exports, module) {
 
             });
             it("should rename a folder", async function () {
-                var oldName     = testDir + "/rename_me",
-                    newName     = testDir + "/renamed_folder",
-                    renameCB    = errSpy(),
-                    statCB      = statSpy();
-
-                complete = false;
-
-                brackets.fs.rename(oldName, newName, renameCB);
-
-                await awaitsFor(function () { return renameCB.wasCalled; }, "rename to finish", 1000);
-
-                expect(renameCB.error).toBe(null);
-
-                // Verify new folder is found and old one is missing
-                brackets.fs.stat(oldName, statCB);
-
-                await awaitsFor(function () { return statCB.wasCalled; }, "stat to finish", 1000);
-
-                expect(statCB.error.code).toBe(brackets.fs.ERR_CODES.ENOENT);
-
-                statCB = statSpy();
-                brackets.fs.stat(newName, statCB);
-
-                await awaitsFor(function () { return statCB.wasCalled; }, "stat to finish", 1000);
-
-                expect(statCB.error).toBe(null);
-
-                // Rename the folder back to the old name
-                renameCB = errSpy();
-                brackets.fs.rename(newName, oldName, renameCB);
-
-                await awaitsFor(function () { return renameCB.wasCalled; }, "rename to finish", 1000);
-
-                expect(renameCB.error).toBe(null);
+                const oldName = testDir + "/rename_me";
+                const newName = testDir + "/renamed_folder";
+                const renameError = await new Promise(resolve => brackets.fs.rename(oldName, newName, resolve));
+                expect(renameError).toBe(null);
+                try {
+                    // Await the filesystem callbacks directly; IndexedDB can be slow on loaded browser runners.
+                    const missingError = await new Promise(resolve => brackets.fs.stat(oldName, resolve));
+                    expect(missingError.code).toBe(brackets.fs.ERR_CODES.ENOENT);
+                    const statError = await new Promise(resolve => brackets.fs.stat(newName, resolve));
+                    expect(statError).toBe(null);
+                } finally {
+                    const restoreError = await new Promise(resolve => brackets.fs.rename(newName, oldName, resolve));
+                    expect(restoreError).toBe(null);
+                }
             });
             it("should rename return an error if the new name already exists", async function () {
                 var oldName = testDir + "/file_one.txt",
diff --git a/test/spec/PreferencesManager-integ-test.js b/test/spec/PreferencesManager-integ-test.js
index f88e6752b8..10c7ca485c 100644
--- a/test/spec/PreferencesManager-integ-test.js
+++ b/test/spec/PreferencesManager-integ-test.js
@@ -156,9 +156,8 @@ define(function (require, exports, module) {
 
             // there will be an error in problems panel if both present
             await awaitsForDone(SpecRunnerUtils.openProjectFiles(".phcode.json"));
-            await awaitsFor(()=>{
-                return testWindow.$("#status-inspection").hasClass("inspection-errors");
-            }, "lint errors detected on .phcode.json");
+            // Check the diagnostic itself: another provider can offer a fix, which changes
+            // the status icon to inspection-repair while the preference conflict still exists.
             if (!testWindow.$("#problems-panel").is(":visible")) {
                 CommandManager.execute(Commands.VIEW_TOGGLE_PROBLEMS);
             }
@@ -168,8 +167,8 @@ define(function (require, exports, module) {
 
             await awaitsForDone(SpecRunnerUtils.openProjectFiles("test.json"));
             await awaitsFor(()=>{
-                return !testWindow.$("#status-inspection").hasClass("inspection-errors");
-            }, "no lint errors for normal test.json file");
+                return !testWindow.$("#problems-panel").text().includes(Strings.ERROR_PREFS_PROJECT_LINT_MESSAGE);
+            }, "no preference conflict for normal test.json file");
 
             await awaitsForDone(SpecRunnerUtils.openProjectFiles(".brackets.json"));
             await awaitsFor(()=>{
diff --git a/test/spec/QuickOpen-integ-test.js b/test/spec/QuickOpen-integ-test.js
index 78a7918d4f..b5df02ee11 100644
--- a/test/spec/QuickOpen-integ-test.js
+++ b/test/spec/QuickOpen-integ-test.js
@@ -198,5 +198,28 @@ define(function (require, exports, module) {
         it("can directly open a file with line:column format and spaces", async function () {
             await quickOpenTest("lines:150: 20", null, "lotsOfLines.html", 150, 20);
         });
+
+        it("can reopen Quick Open after dismissing its results with no document open", async function () {
+            await SpecRunnerUtils.loadProjectInTestWindow(testPath);
+            expect(DocumentManager.getCurrentDocument()).toBeNull();
+
+            executeCommand(Commands.NAVIGATE_QUICK_OPEN);
+            enterSearchText("lines");
+            await _forPopupVisible();
+
+            // Commands dismiss the current popup before executing. With no editor to focus,
+            // dismissing the results must also close the bar and release its search field.
+            executeCommand(Commands.NAVIGATE_QUICK_OPEN);
+            await _forPopupVisible();
+            enterSearchText("lines");
+            await awaitsFor(function () {
+                return getSearchField().val() === "lines";
+            }, "reopened search field to accept input", 1000);
+            pressEnter();
+            await awaitsFor(function () {
+                const doc = DocumentManager.getCurrentDocument();
+                return doc && doc.file.name === "lotsOfLines.html" && getSearchBar().length === 0;
+            }, "reopened Quick Open to open the selected file", 3000);
+        });
     });
 });
diff --git a/test/spec/ScopeManager-integ-test.js b/test/spec/ScopeManager-integ-test.js
index 282ca11f7c..15dc181baf 100644
--- a/test/spec/ScopeManager-integ-test.js
+++ b/test/spec/ScopeManager-integ-test.js
@@ -138,6 +138,36 @@ define(function (require, exports, module) {
             }
         });
 
+        it("should recover from a missing initial directory before switching away from a dirty document", async function () {
+            await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.html"]), "open embedded script");
+            const editor = EditorManager.getCurrentFullEditor();
+            editor.setCursorPos(6, 4);
+            const session = new Session(editor);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "initialize Tern");
+
+            const directoryPath = editor.document.file.parentPath;
+            const resolve = FileSystem.resolve;
+            const lookup = spyOn(FileSystem, "resolve").and.callFake(function (filePath, callback) {
+                if (filePath === directoryPath) {
+                    Promise.resolve().then(() => callback(FileSystemError.NOT_FOUND));
+                    return;
+                }
+                return resolve.apply(this, arguments);
+            });
+            try {
+                // A fresh module completes its failed directory lookup without creating a Tern server.
+                await awaitsForDone(ScopeManager._maybeReset(session, editor.document, true), "missing initial directory");
+            } finally {
+                lookup.and.callThrough();
+            }
+
+            editor.document.setText(editor.document.getText() + "\n<!-- unsaved edit -->");
+            editor.setCursorPos(6, 4);
+            ScopeManager.handleEditorChange(session, editor.document, editor.document);
+            await awaitsForDone(ScopeManager.requestHints(session, editor.document), "hints after failed initialization");
+            expect(session.ternHints.some(hint => hint.value === "push")).toBeTrue();
+        });
+
         it("should initialize HTML without parsing markup as JavaScript", async function () {
             const worker = spyOn(IndexingWorker, "execPeer").and.callThrough();
             await awaitsForDone(SpecRunnerUtils.openProjectFiles(["embedded.html"]), "open embedded script");
diff --git a/test/spec/md-editor-integ-test.js b/test/spec/md-editor-integ-test.js
index ad10bb8425..8f09b06d30 100644
--- a/test/spec/md-editor-integ-test.js
+++ b/test/spec/md-editor-integ-test.js
@@ -818,7 +818,15 @@ define(function (require, exports, module) {
                 // Scroll down
                 _setViewerScrollTop(300);
                 await awaitsFor(() => _getViewerScrollTop() >= 290, "scroll to apply");
-                const scrollBefore = _getViewerScrollTop();
+                // Reload restores the nearest source block, not an exact pixel offset on rebuilt DOM.
+                const viewerBefore = _getMdIFrameDoc().getElementById("app-viewer");
+                const viewerTop = viewerBefore.getBoundingClientRect().top;
+                const sourceElements = Array.from(_getMdIFrameDoc().querySelectorAll("#viewer-content [data-source-line]"));
+                const anchorBefore = sourceElements.reduce((nearest, element) => {
+                    return Math.abs(element.getBoundingClientRect().top - viewerTop) <
+                        Math.abs(nearest.getBoundingClientRect().top - viewerTop) ? element : nearest;
+                });
+                const sourceLine = anchorBefore.getAttribute("data-source-line");
 
                 // Capture the current h1 DOM node
                 const h1Before = _getMdIFrameDoc().querySelector("#viewer-content h1");
@@ -837,11 +845,13 @@ define(function (require, exports, module) {
                 // Verify edit mode preserved
                 await _assertMdEditMode(true);
 
-                // Verify scroll position approximately preserved
+                // Verify the saved reading position is restored even when a source block is tall.
                 await awaitsFor(() => {
-                    const scroll = _getViewerScrollTop();
-                    return Math.abs(scroll - scrollBefore) < 100;
-                }, "scroll position to be approximately restored after reload");
+                    const mdDoc = _getMdIFrameDoc();
+                    const anchor = mdDoc.querySelector('#viewer-content [data-source-line="' + sourceLine + '"]');
+                    const viewer = mdDoc.getElementById("app-viewer");
+                    return anchor && Math.abs(anchor.getBoundingClientRect().top - viewer.getBoundingClientRect().top) < 2;
+                }, "the same source block to be restored after reload");
             }, 15000);
 
             it("should working set changes sync to iframe and cache entries persist", async function () {
diff --git a/tracking-repos.json b/tracking-repos.json
index 81d028be7a..e00197b180 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "c7c083811904228b97763134e12941da987640ab"
+    "commitID": "b3526cd71bf92f5ae9bd5068be259ea3e9f09781"
   }
 }

From 10f7a81e81bcd4187659cc4de8c3c746881a7d18 Mon Sep 17 00:00:00 2001
From: abose <arun@core.ai>
Date: Thu, 1 Oct 2026 08:11:52 +0530
Subject: [PATCH 8/8] test: restore preference conflict status indicator
 coverage

Check a visible warning or repair indicator for conflicting preference files
and a valid indicator for a clean JSON file.
---
 test/spec/PreferencesManager-integ-test.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/spec/PreferencesManager-integ-test.js b/test/spec/PreferencesManager-integ-test.js
index 10c7ca485c..44e9eb3844 100644
--- a/test/spec/PreferencesManager-integ-test.js
+++ b/test/spec/PreferencesManager-integ-test.js
@@ -156,8 +156,12 @@ define(function (require, exports, module) {
 
             // there will be an error in problems panel if both present
             await awaitsForDone(SpecRunnerUtils.openProjectFiles(".phcode.json"));
-            // Check the diagnostic itself: another provider can offer a fix, which changes
-            // the status icon to inspection-repair while the preference conflict still exists.
+            // Keep the visual assertion: another provider can offer a fix, which changes
+            // the warning icon to a repair icon while the preference conflict still exists.
+            await awaitsFor(()=>{
+                return testWindow.$("#status-inspection").is(":visible") &&
+                    testWindow.$("#status-inspection").is(".inspection-errors, .inspection-repair");
+            }, "visible problem indicator on .phcode.json");
             if (!testWindow.$("#problems-panel").is(":visible")) {
                 CommandManager.execute(Commands.VIEW_TOGGLE_PROBLEMS);
             }
@@ -169,11 +173,18 @@ define(function (require, exports, module) {
             await awaitsFor(()=>{
                 return !testWindow.$("#problems-panel").text().includes(Strings.ERROR_PREFS_PROJECT_LINT_MESSAGE);
             }, "no preference conflict for normal test.json file");
+            await awaitsFor(()=>{
+                return testWindow.$("#status-inspection").is(".inspection-valid:visible");
+            }, "valid inspection indicator for normal test.json file");
 
             await awaitsForDone(SpecRunnerUtils.openProjectFiles(".brackets.json"));
             await awaitsFor(()=>{
                 return testWindow.$("#problems-panel").text().includes(Strings.ERROR_PREFS_PROJECT_LINT_MESSAGE);
             }, "problem panel on .brackets.json");
+            await awaitsFor(()=>{
+                return testWindow.$("#status-inspection").is(":visible") &&
+                    testWindow.$("#status-inspection").is(".inspection-errors, .inspection-repair");
+            }, "visible problem indicator on .brackets.json");
         });
 
         it("should open .brackets.json file if it has json errors", async function () {